Merge branch 'veekun8'

pokedex/data/csv/evolution_chains.csv

@@ -327,3 +327,37 @@ id,baby_trigger_item_id
 334,
 335,
 336,
+337,
+338,
+339,
+340,
+341,
+342,
+343,
+344,
+345,
+346,
+347,
+348,
+349,
+350,
+351,
+352,
+353,
+354,
+355,
+356,
+357,
+358,
+359,
+360,
+361,
+362,
+363,
+364,
+365,
+366,
+367,
+368,
+369,
+370,

pokedex/data/csv/generation_names.csv

@@ -4,3 +4,4 @@ generation_id,local_language_id,name
 3,9,Generation III
 4,9,Generation IV
 5,9,Generation V
+6,9,Generation VI

pokedex/data/csv/generations.csv

@@ -1,6 +1,7 @@
-id,main_region_id,canonical_pokedex_id,identifier
-1,1,2,generation-i
-2,2,7,generation-ii
-3,3,4,generation-iii
-4,4,6,generation-iv
-5,5,8,generation-v
+id,main_region_id,identifier
+1,1,generation-i
+2,2,generation-ii
+3,3,generation-iii
+4,4,generation-iv
+5,5,generation-v
+6,6,generation-vi

pokedex/data/csv/pokedex_prose.csv

@@ -9,3 +9,6 @@ pokedex_id,local_language_id,name,description
 8,9,Original Unova,Black/White Unova dex
 9,9,Updated Unova,Black 2/White 2 Unova dex
 11,9,Gallery,Pokémon Conquest gallery order
+12,9,Central Kalos,
+13,9,Coastal Kalos,
+14,9,Mountain Kalos,

pokedex/data/csv/pokedexes.csv

@@ -9,3 +9,6 @@ id,region_id,identifier,is_main_series
 8,5,original-unova,1
 9,5,updated-unova,1
 11,,conquest-gallery,0
+12,6,kalos-central,1
+13,6,kalos-coastal,1
+14,6,kalos-mountain,1

pokedex/data/csv/pokemon_abilities.csv

@@ -1601,36 +1601,36 @@ pokemon_id,ability_id,is_hidden,slot
 647,154,0,1
 648,32,0,1
 649,88,0,1
-650,46,0,1
-651,46,0,1
-652,46,0,1
-653,107,0,1
-653,142,1,3
-654,107,0,1
-654,142,1,3
-655,32,0,1
-656,26,0,1
-656,26,1,3
-657,26,0,1
-658,26,0,1
-659,26,0,1
-660,26,0,1
-661,26,0,1
-662,59,0,1
-663,59,0,1
-664,59,0,1
-665,69,0,1
-665,91,0,2
-665,104,1,3
-666,125,0,1
-666,161,1,3
-667,32,0,1
-668,144,0,1
-668,144,1,3
-669,10,0,1
-669,10,1,3
-670,22,0,1
-670,22,1,3
-671,164,0,1
-672,163,0,1
-673,154,0,1
+10001,46,0,1
+10002,46,0,1
+10003,46,0,1
+10004,107,0,1
+10004,142,1,3
+10005,107,0,1
+10005,142,1,3
+10006,32,0,1
+10007,26,0,1
+10007,26,1,3
+10008,26,0,1
+10009,26,0,1
+10010,26,0,1
+10011,26,0,1
+10012,26,0,1
+10013,59,0,1
+10014,59,0,1
+10015,59,0,1
+10016,69,0,1
+10016,91,0,2
+10016,104,1,3
+10017,125,0,1
+10017,161,1,3
+10018,32,0,1
+10019,144,0,1
+10019,144,1,3
+10020,10,0,1
+10020,10,1,3
+10021,22,0,1
+10021,22,1,3
+10022,164,0,1
+10023,163,0,1
+10024,154,0,1

pokedex/data/csv/pokemon_form_generations.csv

@@ -1929,208 +1929,208 @@ pokemon_form_id,generation_id,game_index
 647,5,0
 648,5,0
 649,5,0
-650,2,1
-650,3,1
-650,4,1
-650,5,1
-651,2,2
-651,3,2
-651,4,2
-651,5,2
-652,2,3
-652,3,3
-652,4,3
-652,5,3
-653,2,4
-653,3,4
-653,4,4
-653,5,4
-654,2,5
-654,3,5
-654,4,5
-654,5,5
-655,2,6
-655,3,6
-655,4,6
-655,5,6
-656,2,7
-656,3,7
-656,4,7
-656,5,7
-657,2,8
-657,3,8
-657,4,8
-657,5,8
-658,2,9
-658,3,9
-658,4,9
-658,5,9
-659,2,10
-659,3,10
-659,4,10
-659,5,10
-660,2,11
-660,3,11
-660,4,11
-660,5,11
-661,2,12
-661,3,12
-661,4,12
-661,5,12
-662,2,13
-662,3,13
-662,4,13
-662,5,13
-663,2,14
-663,3,14
-663,4,14
-663,5,14
-664,2,15
-664,3,15
-664,4,15
-664,5,15
-665,2,16
-665,3,16
-665,4,16
-665,5,16
-666,2,17
-666,3,17
-666,4,17
-666,5,17
-667,2,18
-667,3,18
-667,4,18
-667,5,18
-668,2,19
-668,3,19
-668,4,19
-668,5,19
-669,2,20
-669,3,20
-669,4,20
-669,5,20
-670,2,21
-670,3,21
-670,4,21
-670,5,21
-671,2,22
-671,3,22
-671,4,22
-671,5,22
-672,2,23
-672,3,23
-672,4,23
-672,5,23
-673,2,24
-673,3,24
-673,4,24
-673,5,24
-674,2,25
-674,3,25
-674,4,25
-674,5,25
-675,3,26
-675,4,26
-675,5,26
-676,3,27
-676,4,27
-676,5,27
-677,3,1
-677,4,1
-677,5,1
-678,3,2
-678,4,2
-678,5,2
-679,3,3
-679,4,3
-679,5,3
-680,3,0
-680,4,1
-680,5,1
-681,3,0
-681,4,2
-681,5,2
-682,3,0
-682,4,3
-682,5,3
-683,4,1
-683,5,1
-684,4,2
-684,5,2
-685,4,1
-685,5,1
-686,4,2
-686,5,2
-687,4,1
-687,5,1
-688,4,1
-688,5,1
-689,4,1
-689,5,1
-690,4,6
-690,5,6
-691,4,17
-691,5,16
-692,4,16
-692,5,15
-693,4,13
-693,5,12
-694,4,1
-694,5,1
-695,4,10
-695,5,9
-696,4,2
-696,5,2
-697,4,7
-697,5,7
-698,4,12
-698,5,11
-699,4,4
-699,5,4
-700,4,15
-700,5,14
-701,4,3
-701,5,3
-702,4,14
-702,5,13
-703,4,5
-703,5,5
-704,4,8
-704,5,8
-705,4,11
-705,5,10
-706,4,9
-707,4,1
-707,5,1
-708,4,2
-708,5,2
-709,4,3
-709,5,3
-710,4,4
-710,5,4
-711,4,5
-711,5,5
-712,4,1
-712,5,1
-713,4,1
-713,5,1
-714,4,1
-715,5,1
-716,5,1
-717,5,1
-718,5,2
-719,5,3
-720,5,1
-721,5,2
-722,5,3
-723,5,1
-724,5,1
-725,5,2
-726,5,3
-727,5,4
-728,5,1
-729,5,1
-730,5,1
-731,5,2
-732,5,1
-733,5,1
+10001,2,1
+10001,3,1
+10001,4,1
+10001,5,1
+10002,2,2
+10002,3,2
+10002,4,2
+10002,5,2
+10003,2,3
+10003,3,3
+10003,4,3
+10003,5,3
+10004,2,4
+10004,3,4
+10004,4,4
+10004,5,4
+10005,2,5
+10005,3,5
+10005,4,5
+10005,5,5
+10006,2,6
+10006,3,6
+10006,4,6
+10006,5,6
+10007,2,7
+10007,3,7
+10007,4,7
+10007,5,7
+10008,2,8
+10008,3,8
+10008,4,8
+10008,5,8
+10009,2,9
+10009,3,9
+10009,4,9
+10009,5,9
+10010,2,10
+10010,3,10
+10010,4,10
+10010,5,10
+10011,2,11
+10011,3,11
+10011,4,11
+10011,5,11
+10012,2,12
+10012,3,12
+10012,4,12
+10012,5,12
+10013,2,13
+10013,3,13
+10013,4,13
+10013,5,13
+10014,2,14
+10014,3,14
+10014,4,14
+10014,5,14
+10015,2,15
+10015,3,15
+10015,4,15
+10015,5,15
+10016,2,16
+10016,3,16
+10016,4,16
+10016,5,16
+10017,2,17
+10017,3,17
+10017,4,17
+10017,5,17
+10018,2,18
+10018,3,18
+10018,4,18
+10018,5,18
+10019,2,19
+10019,3,19
+10019,4,19
+10019,5,19
+10020,2,20
+10020,3,20
+10020,4,20
+10020,5,20
+10021,2,21
+10021,3,21
+10021,4,21
+10021,5,21
+10022,2,22
+10022,3,22
+10022,4,22
+10022,5,22
+10023,2,23
+10023,3,23
+10023,4,23
+10023,5,23
+10024,2,24
+10024,3,24
+10024,4,24
+10024,5,24
+10025,2,25
+10025,3,25
+10025,4,25
+10025,5,25
+10026,3,26
+10026,4,26
+10026,5,26
+10027,3,27
+10027,4,27
+10027,5,27
+10028,3,1
+10028,4,1
+10028,5,1
+10029,3,2
+10029,4,2
+10029,5,2
+10030,3,3
+10030,4,3
+10030,5,3
+10031,3,0
+10031,4,1
+10031,5,1
+10032,3,0
+10032,4,2
+10032,5,2
+10033,3,0
+10033,4,3
+10033,5,3
+10034,4,1
+10034,5,1
+10035,4,2
+10035,5,2
+10036,4,1
+10036,5,1
+10037,4,2
+10037,5,2
+10038,4,1
+10038,5,1
+10039,4,1
+10039,5,1
+10040,4,1
+10040,5,1
+10041,4,6
+10041,5,6
+10042,4,17
+10042,5,16
+10043,4,16
+10043,5,15
+10044,4,13
+10044,5,12
+10045,4,1
+10045,5,1
+10046,4,10
+10046,5,9
+10047,4,2
+10047,5,2
+10048,4,7
+10048,5,7
+10049,4,12
+10049,5,11
+10050,4,4
+10050,5,4
+10051,4,15
+10051,5,14
+10052,4,3
+10052,5,3
+10053,4,14
+10053,5,13
+10054,4,5
+10054,5,5
+10055,4,8
+10055,5,8
+10056,4,11
+10056,5,10
+10057,4,9
+10058,4,1
+10058,5,1
+10059,4,2
+10059,5,2
+10060,4,3
+10060,5,3
+10061,4,4
+10061,5,4
+10062,4,5
+10062,5,5
+10063,4,1
+10063,5,1
+10064,4,1
+10064,5,1
+10065,4,1
+10066,5,1
+10067,5,1
+10068,5,1
+10069,5,2
+10070,5,3
+10071,5,1
+10072,5,2
+10073,5,3
+10074,5,1
+10075,5,1
+10076,5,2
+10077,5,3
+10078,5,4
+10079,5,1
+10080,5,1
+10081,5,1
+10082,5,2
+10083,5,1
+10084,5,1

pokedex/data/csv/pokemon_form_names.csv

@@ -1297,171 +1297,316 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 648,9,Aria Forme,Aria Meloetta
 649,5,,
 649,9,,
-650,5,B,Zarbi B
-650,9,B,Unown B
-651,5,C,Zarbi C
-651,9,C,Unown C
-652,5,D,Zarbi D
-652,9,D,Unown D
-653,5,E,Zarbi E
-653,9,E,Unown E
-654,5,F,Zarbi F
-654,9,F,Unown F
-655,5,G,Zarbi G
-655,9,G,Unown G
-656,5,H,Zarbi H
-656,9,H,Unown H
-657,5,I,Zarbi I
-657,9,I,Unown I
-658,5,J,Zarbi J
-658,9,J,Unown J
-659,5,K,Zarbi K
-659,9,K,Unown K
-660,5,L,Zarbi L
-660,9,L,Unown L
-661,5,M,Zarbi M
-661,9,M,Unown M
-662,5,N,Zarbi N
-662,9,N,Unown N
-663,5,O,Zarbi O
-663,9,O,Unown O
-664,5,P,Zarbi P
-664,9,P,Unown P
-665,5,Q,Zarbi Q
-665,9,Q,Unown Q
-666,5,R,Zarbi R
-666,9,R,Unown R
-667,5,S,Zarbi S
-667,9,S,Unown S
-668,5,T,Zarbi T
-668,9,T,Unown T
-669,5,U,Zarbi U
-669,9,U,Unown U
-670,5,V,Zarbi V
-670,9,V,Unown V
-671,5,W,Zarbi W
-671,9,W,Unown W
-672,5,X,Zarbi X
-672,9,X,Unown X
-673,5,Y,Zarbi Y
-673,9,Y,Unown Y
-674,5,Z,Zarbi Z
-674,9,Z,Unown Z
-675,5,!,Zarbi !
-675,9,!,Unown !
-676,5,?,Zarbi ?
-676,9,?,Unown ?
-677,5,Forme Solaire,Morphéo Solaire
-677,9,Sunny Form,Sunny Castform
-678,5,Forme Eau de Pluie,Morphéo Eau de Pluie
-678,9,Rainy Form,Rainy Castform
-679,5,Forme Blizzard,Morphéo Blizzard
-679,9,Snowy Form,Snowy Castform
-680,5,Forme Attaque,Deoxys Attaque
-680,9,Attack Forme,Attack Deoxys
-681,5,Forme Défense,Deoxys Défense
-681,9,Defense Forme,Defense Deoxys
-682,5,Forme Vitesse,Deoxys Vitesse
-682,9,Speed Forme,Speed Deoxys
-683,5,Cape Sable,Cheniti Sable
-683,9,Sandy Cloak,Sandy Burmy
-684,5,Cape Déchet,Cheniti Déchet
-684,9,Trash Cloak,Trash Burmy
-685,5,Cape Sable,Chenselle Sable
-685,9,Sandy Cloak,Sandy Wormadam
-686,5,Cape Déchet,Cheniselle Déchet
-686,9,Trash Cloak,Trash Wormadam
-687,5,Temps Ensoleillé,Ceriflor Ensoleillé
-687,9,Sunshine Form,Sunshine Cherrim
-688,5,Mer Orient,Sancoki Orient
-688,9,East Sea,East Shellos
-689,5,Mer Orient,Tritosor Orient
-689,9,East Sea,East Gastrodon
-690,5,Insecte,Arceus Insecte
-690,9,Bug Type,Bug Arceus
-691,5,Ténèbres,Arceus Ténèbres
-691,9,Dark Type,Dark Arceus
-692,5,Dragon,Arceus Dragon
-692,9,Dragon Type,Dragon Arceus
-693,5,Électrik,Arceus Électrik
-693,9,Electric Type,Electric Arceus
-694,5,Combat,Arceus Combat
-694,9,Fighting Type,Fighting Arceus
-695,5,Feu,Arceus Feu
-695,9,Fire Type,Fire Arceus
-696,5,Vol,Arceus Vol
-696,9,Flying Type,Flying Arceus
-697,5,Spectre,Arceus Spectre
-697,9,Ghost Type,Ghost Arceus
-698,5,Plante,Arceus Plante
-698,9,Grass Type,Grass Arceus
-699,5,Sol,Arceus Sol
-699,9,Ground Type,Ground Arceus
-700,5,Glace,Arceus Glace
-700,9,Ice Type,Ice Arceus
-701,5,Poison,Arceus Poison
-701,9,Poison Type,Poison Arceus
-702,5,Psy,Arceus Psy
-702,9,Psychic Type,Psychic Arceus
-703,5,Roche,Arceus Roche
-703,9,Rock Type,Rock Arceus
-704,5,Acier,Arceus Acier
-704,9,Steel Type,Steel Arceus
-705,5,Eau,Arceus Eau
-705,9,Water Type,Water Arceus
-706,5,???,Arceus ???
-706,9,??? Type,??? Arceus
-707,5,Motisma Chaleur,Motisma Chaleur
-707,9,Heat Rotom,Heat Rotom
-708,5,Motisma Lavage,Motisma Lavage
-708,9,Wash Rotom,Wash Rotom
-709,5,Motisma Froid,Motisma Froid
-709,9,Frost Rotom,Frost Rotom
-710,5,Motisma Hélice,Motisma Hélice
-710,9,Fan Rotom,Fan Rotom
-711,5,Motisma Tonte,Motisma Tonte
-711,9,Mow Rotom,Mow Rotom
-712,5,Forme Originelle,Giratina Originel
-712,9,Origin Forme,Origin Giratina
-713,5,Forme Céleste,Shaymin Céleste
-713,9,Sky Forme,Sky Shaymin
-714,5,Troizépi,Pichu Troizépi
-714,9,Spiky-eared,Spiky-eared Pichu
-715,5,Motif Bleu,Bargantua Bleu
-715,9,Blue-Striped Form,Blue-Striped Basculin
-716,5,Mode Transe,Darumacho Transe
-716,9,Zen Mode,Zen Darmanitan
-717,5,Forme Été,Vivaldaim Été
-717,9,Summer Form,Summer Deerling
-718,5,Forme Automne,Vivaldaim Automne
-718,9,Autumn Form,Autumn Deerling
-719,5,Forme Hiver,Vivaldaim Hiver
-719,9,Winter Form,Winter Deerling
-720,5,Forme Été,Haydaim Été
-720,9,Summer Form,Summer Sawsbuck
-721,5,Forme Automne,Haydaim Automne
-721,9,Autumn Form,Autumn Sawsbuck
-722,5,Forme Hiver,Haydaim Hiver
-722,9,Winter Form,Winter Sawsbuck
-723,5,Forme Danse,Meloetta Danse
-723,9,Pirouette Forme,Pirouette Meloetta
-724,5,Module Aqua,Genesect Aqua
-724,9,Douse Drive,Douse Genesect
-725,5,Module Choc,Genesect Choc
-725,9,Shock Drive,Shock Genesect
-726,5,Module Pyro,Genesect Pyro
-726,9,Burn Drive,Burn Genesect
-727,5,Module Cryo,Genesect Cryo
-727,9,Chill Drive,Chill Genesect
-728,5,Forme Totémique,Boréas Totémique
-728,9,Therian Forme,Therian Tornadus
-729,5,Forme Totémique,Fulguris Totémique
-729,9,Therian Forme,Therian Thundurus
-730,5,Forme Totémique,Démétéros Totémique
-730,9,Therian Forme,Therian Landorus
-731,5,Kyurem Noir,Kyurem Noir
-731,9,Black Kyurem,Black Kyurem
-732,5,Kyurem Blanc,Kyurem Blanc
-732,9,White Kyurem,White Kyurem
-733,5,Aspect Décidé,Keldeo Décidé
-733,9,Resolute Form,Resolute Keldeo
+650,9,,
+651,9,,
+652,9,,
+653,9,,
+654,9,,
+655,9,,
+656,9,,
+657,9,,
+658,9,,
+659,9,,
+660,9,,
+661,9,,
+662,9,,
+663,9,,
+664,9,,
+665,9,,
+666,9,Meadow Pattern,Meadow Vivillon
+667,9,,
+668,9,,
+669,9,Red Flower,Red Flabébé
+670,9,Red Flower,Red Floette
+671,9,Red Flower,Red Florges
+672,9,,
+673,9,,
+674,9,,
+675,9,,
+676,9,,
+677,9,,
+678,9,Male,Male Meowstic
+679,9,,
+680,9,,
+681,9,Shield Forme,Shield Aegislash
+682,9,,
+683,9,,
+684,9,,
+685,9,,
+686,9,,
+687,9,,
+688,9,,
+689,9,,
+690,9,,
+691,9,,
+692,9,,
+693,9,,
+694,9,,
+695,9,,
+696,9,,
+697,9,,
+698,9,,
+699,9,,
+700,9,,
+701,9,,
+702,9,,
+703,9,,
+704,9,,
+705,9,,
+706,9,,
+707,9,,
+708,9,,
+709,9,,
+710,9,Average Size,Average Pumpkaboo
+711,9,Average Size,Average Gourgeist
+712,9,,
+713,9,,
+714,9,,
+715,9,,
+716,9,Active Mode,Active Xerneas
+717,9,,
+718,9,,
+10001,5,B,Zarbi B
+10001,9,B,Unown B
+10002,5,C,Zarbi C
+10002,9,C,Unown C
+10003,5,D,Zarbi D
+10003,9,D,Unown D
+10004,5,E,Zarbi E
+10004,9,E,Unown E
+10005,5,F,Zarbi F
+10005,9,F,Unown F
+10006,5,G,Zarbi G
+10006,9,G,Unown G
+10007,5,H,Zarbi H
+10007,9,H,Unown H
+10008,5,I,Zarbi I
+10008,9,I,Unown I
+10009,5,J,Zarbi J
+10009,9,J,Unown J
+10010,5,K,Zarbi K
+10010,9,K,Unown K
+10011,5,L,Zarbi L
+10011,9,L,Unown L
+10012,5,M,Zarbi M
+10012,9,M,Unown M
+10013,5,N,Zarbi N
+10013,9,N,Unown N
+10014,5,O,Zarbi O
+10014,9,O,Unown O
+10015,5,P,Zarbi P
+10015,9,P,Unown P
+10016,5,Q,Zarbi Q
+10016,9,Q,Unown Q
+10017,5,R,Zarbi R
+10017,9,R,Unown R
+10018,5,S,Zarbi S
+10018,9,S,Unown S
+10019,5,T,Zarbi T
+10019,9,T,Unown T
+10020,5,U,Zarbi U
+10020,9,U,Unown U
+10021,5,V,Zarbi V
+10021,9,V,Unown V
+10022,5,W,Zarbi W
+10022,9,W,Unown W
+10023,5,X,Zarbi X
+10023,9,X,Unown X
+10024,5,Y,Zarbi Y
+10024,9,Y,Unown Y
+10025,5,Z,Zarbi Z
+10025,9,Z,Unown Z
+10026,5,!,Zarbi !
+10026,9,!,Unown !
+10027,5,?,Zarbi ?
+10027,9,?,Unown ?
+10028,5,Forme Solaire,Morphéo Solaire
+10028,9,Sunny Form,Sunny Castform
+10029,5,Forme Eau de Pluie,Morphéo Eau de Pluie
+10029,9,Rainy Form,Rainy Castform
+10030,5,Forme Blizzard,Morphéo Blizzard
+10030,9,Snowy Form,Snowy Castform
+10031,5,Forme Attaque,Deoxys Attaque
+10031,9,Attack Forme,Attack Deoxys
+10032,5,Forme Défense,Deoxys Défense
+10032,9,Defense Forme,Defense Deoxys
+10033,5,Forme Vitesse,Deoxys Vitesse
+10033,9,Speed Forme,Speed Deoxys
+10034,5,Cape Sable,Cheniti Sable
+10034,9,Sandy Cloak,Sandy Burmy
+10035,5,Cape Déchet,Cheniti Déchet
+10035,9,Trash Cloak,Trash Burmy
+10036,5,Cape Sable,Chenselle Sable
+10036,9,Sandy Cloak,Sandy Wormadam
+10037,5,Cape Déchet,Cheniselle Déchet
+10037,9,Trash Cloak,Trash Wormadam
+10038,5,Temps Ensoleillé,Ceriflor Ensoleillé
+10038,9,Sunshine Form,Sunshine Cherrim
+10039,5,Mer Orient,Sancoki Orient
+10039,9,East Sea,East Shellos
+10040,5,Mer Orient,Tritosor Orient
+10040,9,East Sea,East Gastrodon
+10041,5,Insecte,Arceus Insecte
+10041,9,Bug Type,Bug Arceus
+10042,5,Ténèbres,Arceus Ténèbres
+10042,9,Dark Type,Dark Arceus
+10043,5,Dragon,Arceus Dragon
+10043,9,Dragon Type,Dragon Arceus
+10044,5,Électrik,Arceus Électrik
+10044,9,Electric Type,Electric Arceus
+10045,5,Combat,Arceus Combat
+10045,9,Fighting Type,Fighting Arceus
+10046,5,Feu,Arceus Feu
+10046,9,Fire Type,Fire Arceus
+10047,5,Vol,Arceus Vol
+10047,9,Flying Type,Flying Arceus
+10048,5,Spectre,Arceus Spectre
+10048,9,Ghost Type,Ghost Arceus
+10049,5,Plante,Arceus Plante
+10049,9,Grass Type,Grass Arceus
+10050,5,Sol,Arceus Sol
+10050,9,Ground Type,Ground Arceus
+10051,5,Glace,Arceus Glace
+10051,9,Ice Type,Ice Arceus
+10052,5,Poison,Arceus Poison
+10052,9,Poison Type,Poison Arceus
+10053,5,Psy,Arceus Psy
+10053,9,Psychic Type,Psychic Arceus
+10054,5,Roche,Arceus Roche
+10054,9,Rock Type,Rock Arceus
+10055,5,Acier,Arceus Acier
+10055,9,Steel Type,Steel Arceus
+10056,5,Eau,Arceus Eau
+10056,9,Water Type,Water Arceus
+10057,5,???,Arceus ???
+10057,9,??? Type,??? Arceus
+10058,5,Motisma Chaleur,Motisma Chaleur
+10058,9,Heat Rotom,Heat Rotom
+10059,5,Motisma Lavage,Motisma Lavage
+10059,9,Wash Rotom,Wash Rotom
+10060,5,Motisma Froid,Motisma Froid
+10060,9,Frost Rotom,Frost Rotom
+10061,5,Motisma Hélice,Motisma Hélice
+10061,9,Fan Rotom,Fan Rotom
+10062,5,Motisma Tonte,Motisma Tonte
+10062,9,Mow Rotom,Mow Rotom
+10063,5,Forme Originelle,Giratina Originel
+10063,9,Origin Forme,Origin Giratina
+10064,5,Forme Céleste,Shaymin Céleste
+10064,9,Sky Forme,Sky Shaymin
+10065,5,Troizépi,Pichu Troizépi
+10065,9,Spiky-eared,Spiky-eared Pichu
+10066,5,Motif Bleu,Bargantua Bleu
+10066,9,Blue-Striped Form,Blue-Striped Basculin
+10067,5,Mode Transe,Darumacho Transe
+10067,9,Zen Mode,Zen Darmanitan
+10068,5,Forme Été,Vivaldaim Été
+10068,9,Summer Form,Summer Deerling
+10069,5,Forme Automne,Vivaldaim Automne
+10069,9,Autumn Form,Autumn Deerling
+10070,5,Forme Hiver,Vivaldaim Hiver
+10070,9,Winter Form,Winter Deerling
+10071,5,Forme Été,Haydaim Été
+10071,9,Summer Form,Summer Sawsbuck
+10072,5,Forme Automne,Haydaim Automne
+10072,9,Autumn Form,Autumn Sawsbuck
+10073,5,Forme Hiver,Haydaim Hiver
+10073,9,Winter Form,Winter Sawsbuck
+10074,5,Forme Danse,Meloetta Danse
+10074,9,Pirouette Forme,Pirouette Meloetta
+10075,5,Module Aqua,Genesect Aqua
+10075,9,Douse Drive,Douse Genesect
+10076,5,Module Choc,Genesect Choc
+10076,9,Shock Drive,Shock Genesect
+10077,5,Module Pyro,Genesect Pyro
+10077,9,Burn Drive,Burn Genesect
+10078,5,Module Cryo,Genesect Cryo
+10078,9,Chill Drive,Chill Genesect
+10079,5,Forme Totémique,Boréas Totémique
+10079,9,Therian Forme,Therian Tornadus
+10080,5,Forme Totémique,Fulguris Totémique
+10080,9,Therian Forme,Therian Thundurus
+10081,5,Forme Totémique,Démétéros Totémique
+10081,9,Therian Forme,Therian Landorus
+10082,5,Kyurem Noir,Kyurem Noir
+10082,9,Black Kyurem,Black Kyurem
+10083,5,Kyurem Blanc,Kyurem Blanc
+10083,9,White Kyurem,White Kyurem
+10084,5,Aspect Décidé,Keldeo Décidé
+10084,9,Resolute Form,Resolute Keldeo
+10085,9,Fairy Type,Fairy Arceus
+10086,9,Icy Snow Pattern,Icy Snow Vivillon
+10087,9,Polar Pattern,Polar Vivillon
+10088,9,Tundra Pattern,Tundra Vivillon
+10089,9,Continental Pattern,Continental Vivillon
+10090,9,Garden Pattern,Garden Vivillon
+10091,9,Elegant Pattern,Elegant Vivillon
+10092,9,Modern Pattern,Modern Vivillon
+10093,9,Marine Pattern,Marine Vivillon
+10094,9,Archipelago Pattern,Archipelago Vivillon
+10095,9,High Plains Pattern,High Plains Vivillon
+10096,9,Sandstorm Pattern,Sandstorm Vivillon
+10097,9,River Pattern,River Vivillon
+10098,9,Monsoon Pattern,Monsoon Vivillon
+10099,9,Savanna Pattern,Savanna Vivillon
+10100,9,Sun Pattern,Sun Vivillon
+10101,9,Ocean Pattern,Ocean Vivillon
+10102,9,Jungle Pattern,Jungle Vivillon
+10103,9,Yellow Flower,Yellow Flabébé
+10104,9,Orange Flower,Orange Flabébé
+10105,9,Blue Flower,Blue Flabébé
+10106,9,White Flower,White Flabébé
+10107,9,Yellow Flower,Yellow Floette
+10108,9,Orange Flower,Orange Floette
+10109,9,Blue Flower,Blue Floette
+10110,9,White Flower,White Floette
+10111,9,Yellow Flower,Yellow Florges
+10112,9,Orange Flower,Orange Florges
+10113,9,Blue Flower,Blue Florges
+10114,9,White Flower,White Florges
+10115,9,Heart Trim,Heart Furfrou
+10116,9,Star Trim,Star Furfrou
+10117,9,Diamond Trim,Diamond Furfrou
+10118,9,Debutante Trim,Debutante Furfrou
+10119,9,Matron Trim,Matron Furfrou
+10120,9,Dandy Trim,Dandy Furfrou
+10121,9,La Reine Trim,La Reine Furfrou
+10122,9,Kabuki Trim,Kabuki Furfrou
+10123,9,Pharaoh Trim,Pharaoh Furfrou
+10124,9,Female,Female Meowstic
+10125,9,Blade Forme,Blade Aegislash
+10126,9,Small Size,Small Pumpkaboo
+10127,9,Large Size,Large Pumpkaboo
+10128,9,Super Size,Super Pumpkaboo
+10129,9,Small Size,Small Gourgeist
+10130,9,Large Size,Large Gourgeist
+10131,9,Super Size,Super Gourgeist
+10132,9,Neutral Mode,Neutral Xerneas
+10133,9,Mega Evolution,Mega Venusaur
+10134,9,Mega Evolution X,Mega Charizard X
+10135,9,Mega Evolution Y,Mega Charizard Y
+10136,9,Mega Evolution,Mega Blastoise
+10137,9,Mega Evolution,Mega Alakazam
+10138,9,Mega Evolution,Mega Gengar
+10139,9,Mega Evolution,Mega Kangaskhan
+10140,9,Mega Evolution,Mega Pinsir
+10141,9,Mega Evolution,Mega Gyarados
+10142,9,Mega Evolution,Mega Aerodactyl
+10143,9,Mega Evolution X,Mega Mewtwo X
+10144,9,Mega Evolution Y,Mega Mewtwo Y
+10145,9,Mega Evolution,Mega Ampharos
+10146,9,Mega Evolution,Mega Scizor
+10147,9,Mega Evolution,Mega Heracross
+10148,9,Mega Evolution,Mega Houndoom
+10149,9,Mega Evolution,Mega Tyranitar
+10150,9,Mega Evolution,Mega Blaziken
+10151,9,Mega Evolution,Mega Gardevoir
+10152,9,Mega Evolution,Mega Mawile
+10153,9,Mega Evolution,Mega Aggron
+10154,9,Mega Evolution,Mega Medicham
+10155,9,Mega Evolution,Mega Manectric
+10156,9,Mega Evolution,Mega Banette
+10157,9,Mega Evolution,Mega Absol
+10158,9,Mega Evolution,Mega Garchomp
+10159,9,Mega Evolution,Mega Lucario
+10160,9,Mega Evolution,Mega Abomasnow

pokedex/data/csv/pokemon_form_pokeathlon_stats.csv

@@ -2464,308 +2464,308 @@ pokemon_form_id,pokeathlon_stat_id,minimum_stat,base_stat,maximum_stat
 493,3,1,4,5
 493,4,1,5,5
 493,5,2,4,5
-650,1,1,2,4
-650,2,1,2,3
-650,3,1,2,4
-650,4,1,2,4
-650,5,2,2,5
-651,1,1,2,4
-651,2,1,2,3
-651,3,1,2,4
-651,4,1,2,4
-651,5,2,2,5
-652,1,1,2,4
-652,2,1,2,3
-652,3,1,2,4
-652,4,1,2,4
-652,5,2,2,5
-653,1,1,2,4
-653,2,1,2,3
-653,3,1,2,4
-653,4,1,2,4
-653,5,2,2,5
-654,1,1,2,4
-654,2,1,2,3
-654,3,1,2,4
-654,4,1,2,4
-654,5,2,2,5
-655,1,1,2,4
-655,2,1,2,3
-655,3,1,2,4
-655,4,1,2,4
-655,5,2,2,5
-656,1,1,2,4
-656,2,1,2,3
-656,3,1,2,4
-656,4,1,2,4
-656,5,2,2,5
-657,1,1,2,4
-657,2,1,2,3
-657,3,1,2,4
-657,4,1,2,4
-657,5,2,2,5
-658,1,1,2,4
-658,2,1,2,3
-658,3,1,2,4
-658,4,1,2,4
-658,5,2,2,5
-659,1,1,2,4
-659,2,1,2,3
-659,3,1,2,4
-659,4,1,2,4
-659,5,2,2,5
-660,1,1,2,4
-660,2,1,2,3
-660,3,1,2,4
-660,4,1,2,4
-660,5,2,2,5
-661,1,1,2,4
-661,2,1,2,3
-661,3,1,2,4
-661,4,1,2,4
-661,5,2,2,5
-662,1,1,2,4
-662,2,1,2,3
-662,3,1,2,4
-662,4,1,2,4
-662,5,2,2,5
-663,1,1,2,4
-663,2,1,2,3
-663,3,1,2,4
-663,4,1,2,4
-663,5,2,2,5
-664,1,1,2,4
-664,2,1,2,3
-664,3,1,2,4
-664,4,1,2,4
-664,5,2,2,5
-665,1,1,2,4
-665,2,1,2,3
-665,3,1,2,4
-665,4,1,2,4
-665,5,2,2,5
-666,1,1,2,4
-666,2,1,2,3
-666,3,1,2,4
-666,4,1,2,4
-666,5,2,2,5
-667,1,1,2,4
-667,2,1,2,3
-667,3,1,2,4
-667,4,1,2,4
-667,5,2,2,5
-668,1,1,2,4
-668,2,1,2,3
-668,3,1,2,4
-668,4,1,2,4
-668,5,2,2,5
-669,1,1,2,4
-669,2,1,2,3
-669,3,1,2,4
-669,4,1,2,4
-669,5,2,2,5
-670,1,1,2,4
-670,2,1,2,3
-670,3,1,2,4
-670,4,1,2,4
-670,5,2,2,5
-671,1,1,2,4
-671,2,1,2,3
-671,3,1,2,4
-671,4,1,2,4
-671,5,2,2,5
-672,1,1,2,4
-672,2,1,2,3
-672,3,1,2,4
-672,4,1,2,4
-672,5,2,2,5
-673,1,1,2,4
-673,2,1,2,3
-673,3,1,2,4
-673,4,1,2,4
-673,5,2,2,5
-674,1,1,2,4
-674,2,1,2,3
-674,3,1,2,4
-674,4,1,2,4
-674,5,2,2,5
-675,1,1,2,4
-675,2,1,2,3
-675,3,1,2,5
-675,4,1,2,4
-675,5,2,2,5
-676,1,1,2,4
-676,2,1,2,3
-676,3,1,2,5
-676,4,1,2,4
-676,5,2,2,5
-680,1,2,4,5
-680,2,4,5,5
-680,3,1,4,5
-680,4,1,2,3
-680,5,2,3,4
-681,1,1,3,3
-681,2,1,3,4
-681,3,2,4,5
-681,4,4,5,5
-681,5,2,2,3
-682,1,4,5,5
-682,2,1,2,3
-682,3,2,4,5
-682,4,1,3,4
-682,5,2,4,4
-683,1,1,1,4
-683,2,1,1,4
-683,3,1,1,4
-683,4,1,1,5
-683,5,2,2,3
-684,1,1,1,4
-684,2,1,1,5
-684,3,1,1,3
-684,4,1,1,5
-684,5,2,2,3
-685,1,1,2,3
-685,2,3,4,5
-685,3,1,2,2
-685,4,1,4,5
-685,5,2,2,3
-686,1,1,1,3
-686,2,1,3,5
-686,3,1,2,3
-686,4,5,5,5
-686,5,2,2,2
-688,1,1,1,3
-688,2,1,1,4
-688,3,1,1,3
-688,4,1,3,5
-688,5,2,2,2
-689,1,1,1,2
-689,2,3,4,5
-689,3,1,3,3
-689,4,4,5,5
-689,5,2,2,2
-690,1,5,5,5
-690,2,1,4,5
-690,3,1,4,5
-690,4,1,4,5
-690,5,2,5,5
-691,1,1,4,5
-691,2,5,5,5
-691,3,1,5,5
-691,4,1,4,5
-691,5,2,4,5
-692,1,1,3,5
-692,2,1,5,5
-692,3,1,5,5
-692,4,1,5,5
-692,5,2,5,5
-693,1,5,5,5
-693,2,1,4,5
-693,3,1,5,5
-693,4,1,4,5
-693,5,2,4,5
-694,1,1,4,5
-694,2,1,5,5
-694,3,5,5,5
-694,4,1,4,5
-694,5,2,4,5
-695,1,1,4,5
-695,2,5,5,5
-695,3,1,4,5
-695,4,1,5,5
-695,5,2,4,5
-696,1,1,5,5
-696,2,1,4,5
-696,3,1,4,5
-696,4,1,4,5
-696,5,5,5,5
-697,1,1,4,5
-697,2,1,4,5
-697,3,1,5,5
-697,4,1,4,5
-697,5,5,5,5
-698,1,1,4,5
-698,2,1,4,5
-698,3,1,4,5
-698,4,5,5,5
-698,5,2,5,5
-699,1,1,4,5
-699,2,1,5,5
-699,3,1,4,5
-699,4,5,5,5
-699,5,2,4,5
-700,1,5,5,5
-700,2,1,5,5
-700,3,1,4,5
-700,4,1,4,5
-700,5,2,4,5
-701,1,1,4,5
-701,2,1,4,5
-701,3,5,5,5
-701,4,1,5,5
-701,5,2,4,5
-702,1,1,5,5
-702,2,1,4,5
-702,3,5,5,5
-702,4,1,4,5
-702,5,2,4,5
-703,1,1,4,5
-703,2,5,5,5
-703,3,1,4,5
-703,4,1,5,5
-703,5,2,4,5
-704,1,1,4,5
-704,2,1,4,5
-704,3,1,5,5
-704,4,5,5,5
-704,5,2,4,5
-705,1,1,5,5
-705,2,1,4,5
-705,3,5,5,5
-705,4,1,4,5
-705,5,2,4,5
-706,1,1,5,5
-706,2,1,5,5
-706,3,1,5,5
-706,4,1,5,5
-706,5,2,5,5
-707,1,2,3,4
-707,2,2,4,4
-707,3,1,3,4
-707,4,1,3,4
-707,5,2,4,4
-708,1,1,3,3
-708,2,1,3,3
-708,3,1,3,4
-708,4,1,4,4
-708,5,2,2,4
-709,1,1,3,4
-709,2,1,2,3
-709,3,3,4,5
-709,4,1,3,3
-709,5,3,3,4
-710,1,3,3,5
-710,2,1,3,5
-710,3,1,3,3
-710,4,1,2,3
-710,5,4,5,5
-711,1,1,3,3
-711,2,1,3,3
-711,3,3,5,5
-711,4,3,3,4
-711,5,2,2,4
-712,1,1,3,5
-712,2,1,3,5
-712,3,1,3,5
-712,4,1,3,5
-712,5,2,3,5
-713,1,3,3,5
-713,2,1,4,4
-713,3,1,3,4
-713,4,1,3,3
-713,5,3,5,5
-714,1,3,5,5
-714,2,1,1,1
-714,3,1,3,5
-714,4,1,1,3
-714,5,2,3,4
+10001,1,1,2,4
+10001,2,1,2,3
+10001,3,1,2,4
+10001,4,1,2,4
+10001,5,2,2,5
+10002,1,1,2,4
+10002,2,1,2,3
+10002,3,1,2,4
+10002,4,1,2,4
+10002,5,2,2,5
+10003,1,1,2,4
+10003,2,1,2,3
+10003,3,1,2,4
+10003,4,1,2,4
+10003,5,2,2,5
+10004,1,1,2,4
+10004,2,1,2,3
+10004,3,1,2,4
+10004,4,1,2,4
+10004,5,2,2,5
+10005,1,1,2,4
+10005,2,1,2,3
+10005,3,1,2,4
+10005,4,1,2,4
+10005,5,2,2,5
+10006,1,1,2,4
+10006,2,1,2,3
+10006,3,1,2,4
+10006,4,1,2,4
+10006,5,2,2,5
+10007,1,1,2,4
+10007,2,1,2,3
+10007,3,1,2,4
+10007,4,1,2,4
+10007,5,2,2,5
+10008,1,1,2,4
+10008,2,1,2,3
+10008,3,1,2,4
+10008,4,1,2,4
+10008,5,2,2,5
+10009,1,1,2,4
+10009,2,1,2,3
+10009,3,1,2,4
+10009,4,1,2,4
+10009,5,2,2,5
+10010,1,1,2,4
+10010,2,1,2,3
+10010,3,1,2,4
+10010,4,1,2,4
+10010,5,2,2,5
+10011,1,1,2,4
+10011,2,1,2,3
+10011,3,1,2,4
+10011,4,1,2,4
+10011,5,2,2,5
+10012,1,1,2,4
+10012,2,1,2,3
+10012,3,1,2,4
+10012,4,1,2,4
+10012,5,2,2,5
+10013,1,1,2,4
+10013,2,1,2,3
+10013,3,1,2,4
+10013,4,1,2,4
+10013,5,2,2,5
+10014,1,1,2,4
+10014,2,1,2,3
+10014,3,1,2,4
+10014,4,1,2,4
+10014,5,2,2,5
+10015,1,1,2,4
+10015,2,1,2,3
+10015,3,1,2,4
+10015,4,1,2,4
+10015,5,2,2,5
+10016,1,1,2,4
+10016,2,1,2,3
+10016,3,1,2,4
+10016,4,1,2,4
+10016,5,2,2,5
+10017,1,1,2,4
+10017,2,1,2,3
+10017,3,1,2,4
+10017,4,1,2,4
+10017,5,2,2,5
+10018,1,1,2,4
+10018,2,1,2,3
+10018,3,1,2,4
+10018,4,1,2,4
+10018,5,2,2,5
+10019,1,1,2,4
+10019,2,1,2,3
+10019,3,1,2,4
+10019,4,1,2,4
+10019,5,2,2,5
+10020,1,1,2,4
+10020,2,1,2,3
+10020,3,1,2,4
+10020,4,1,2,4
+10020,5,2,2,5
+10021,1,1,2,4
+10021,2,1,2,3
+10021,3,1,2,4
+10021,4,1,2,4
+10021,5,2,2,5
+10022,1,1,2,4
+10022,2,1,2,3
+10022,3,1,2,4
+10022,4,1,2,4
+10022,5,2,2,5
+10023,1,1,2,4
+10023,2,1,2,3
+10023,3,1,2,4
+10023,4,1,2,4
+10023,5,2,2,5
+10024,1,1,2,4
+10024,2,1,2,3
+10024,3,1,2,4
+10024,4,1,2,4
+10024,5,2,2,5
+10025,1,1,2,4
+10025,2,1,2,3
+10025,3,1,2,4
+10025,4,1,2,4
+10025,5,2,2,5
+10026,1,1,2,4
+10026,2,1,2,3
+10026,3,1,2,5
+10026,4,1,2,4
+10026,5,2,2,5
+10027,1,1,2,4
+10027,2,1,2,3
+10027,3,1,2,5
+10027,4,1,2,4
+10027,5,2,2,5
+10031,1,2,4,5
+10031,2,4,5,5
+10031,3,1,4,5
+10031,4,1,2,3
+10031,5,2,3,4
+10032,1,1,3,3
+10032,2,1,3,4
+10032,3,2,4,5
+10032,4,4,5,5
+10032,5,2,2,3
+10033,1,4,5,5
+10033,2,1,2,3
+10033,3,2,4,5
+10033,4,1,3,4
+10033,5,2,4,4
+10034,1,1,1,4
+10034,2,1,1,4
+10034,3,1,1,4
+10034,4,1,1,5
+10034,5,2,2,3
+10035,1,1,1,4
+10035,2,1,1,5
+10035,3,1,1,3
+10035,4,1,1,5
+10035,5,2,2,3
+10036,1,1,2,3
+10036,2,3,4,5
+10036,3,1,2,2
+10036,4,1,4,5
+10036,5,2,2,3
+10037,1,1,1,3
+10037,2,1,3,5
+10037,3,1,2,3
+10037,4,5,5,5
+10037,5,2,2,2
+10039,1,1,1,3
+10039,2,1,1,4
+10039,3,1,1,3
+10039,4,1,3,5
+10039,5,2,2,2
+10040,1,1,1,2
+10040,2,3,4,5
+10040,3,1,3,3
+10040,4,4,5,5
+10040,5,2,2,2
+10041,1,5,5,5
+10041,2,1,4,5
+10041,3,1,4,5
+10041,4,1,4,5
+10041,5,2,5,5
+10042,1,1,4,5
+10042,2,5,5,5
+10042,3,1,5,5
+10042,4,1,4,5
+10042,5,2,4,5
+10043,1,1,3,5
+10043,2,1,5,5
+10043,3,1,5,5
+10043,4,1,5,5
+10043,5,2,5,5
+10044,1,5,5,5
+10044,2,1,4,5
+10044,3,1,5,5
+10044,4,1,4,5
+10044,5,2,4,5
+10045,1,1,4,5
+10045,2,1,5,5
+10045,3,5,5,5
+10045,4,1,4,5
+10045,5,2,4,5
+10046,1,1,4,5
+10046,2,5,5,5
+10046,3,1,4,5
+10046,4,1,5,5
+10046,5,2,4,5
+10047,1,1,5,5
+10047,2,1,4,5
+10047,3,1,4,5
+10047,4,1,4,5
+10047,5,5,5,5
+10048,1,1,4,5
+10048,2,1,4,5
+10048,3,1,5,5
+10048,4,1,4,5
+10048,5,5,5,5
+10049,1,1,4,5
+10049,2,1,4,5
+10049,3,1,4,5
+10049,4,5,5,5
+10049,5,2,5,5
+10050,1,1,4,5
+10050,2,1,5,5
+10050,3,1,4,5
+10050,4,5,5,5
+10050,5,2,4,5
+10051,1,5,5,5
+10051,2,1,5,5
+10051,3,1,4,5
+10051,4,1,4,5
+10051,5,2,4,5
+10052,1,1,4,5
+10052,2,1,4,5
+10052,3,5,5,5
+10052,4,1,5,5
+10052,5,2,4,5
+10053,1,1,5,5
+10053,2,1,4,5
+10053,3,5,5,5
+10053,4,1,4,5
+10053,5,2,4,5
+10054,1,1,4,5
+10054,2,5,5,5
+10054,3,1,4,5
+10054,4,1,5,5
+10054,5,2,4,5
+10055,1,1,4,5
+10055,2,1,4,5
+10055,3,1,5,5
+10055,4,5,5,5
+10055,5,2,4,5
+10056,1,1,5,5
+10056,2,1,4,5
+10056,3,5,5,5
+10056,4,1,4,5
+10056,5,2,4,5
+10057,1,1,5,5
+10057,2,1,5,5
+10057,3,1,5,5
+10057,4,1,5,5
+10057,5,2,5,5
+10058,1,2,3,4
+10058,2,2,4,4
+10058,3,1,3,4
+10058,4,1,3,4
+10058,5,2,4,4
+10059,1,1,3,3
+10059,2,1,3,3
+10059,3,1,3,4
+10059,4,1,4,4
+10059,5,2,2,4
+10060,1,1,3,4
+10060,2,1,2,3
+10060,3,3,4,5
+10060,4,1,3,3
+10060,5,3,3,4
+10061,1,3,3,5
+10061,2,1,3,5
+10061,3,1,3,3
+10061,4,1,2,3
+10061,5,4,5,5
+10062,1,1,3,3
+10062,2,1,3,3
+10062,3,3,5,5
+10062,4,3,3,4
+10062,5,2,2,4
+10063,1,1,3,5
+10063,2,1,3,5
+10063,3,1,3,5
+10063,4,1,3,5
+10063,5,2,3,5
+10064,1,3,3,5
+10064,2,1,4,4
+10064,3,1,3,4
+10064,4,1,3,3
+10064,5,3,5,5
+10065,1,3,5,5
+10065,2,1,1,1
+10065,3,1,3,5
+10065,4,1,1,3
+10065,5,2,3,4

pokedex/data/csv/pokemon_game_indices.csv

@@ -8193,136 +8193,136 @@ pokemon_id,version_id,game_index
 649,18,649
 649,21,649
 649,22,649
-650,10,410
-650,12,496
-650,13,496
-650,14,496
-650,15,496
-650,16,496
-650,17,650
-650,18,650
-650,21,685
-650,22,685
-651,11,410
-651,12,497
-651,13,497
-651,14,497
-651,15,497
-651,16,497
-651,17,651
-651,18,651
-651,21,686
-651,22,686
-652,9,410
-652,12,498
-652,13,498
-652,14,498
-652,15,498
-652,16,498
-652,17,652
-652,18,652
-652,21,687
-652,22,687
-653,12,499
-653,13,499
-653,14,499
-653,15,499
-653,16,499
-653,17,653
-653,18,653
-653,21,688
-653,22,688
-654,12,500
-654,13,500
-654,14,500
-654,15,500
-654,16,500
-654,17,654
-654,18,654
-654,21,689
-654,22,689
-655,14,502
-655,15,502
-655,16,502
-655,17,655
-655,18,655
-655,21,690
-655,22,690
-656,14,501
-656,15,501
-656,16,501
-656,17,656
-656,18,656
-656,21,691
-656,22,691
-657,14,503
-657,15,503
-657,16,503
-657,17,657
-657,18,657
-657,21,692
-657,22,692
-658,14,504
-658,15,504
-658,16,504
-658,17,658
-658,18,658
-658,21,693
-658,22,693
-659,14,505
-659,15,505
-659,16,505
-659,17,659
-659,18,659
-659,21,694
-659,22,694
-660,14,506
-660,15,506
-660,16,506
-660,17,660
-660,18,660
-660,21,695
-660,22,695
-661,14,507
-661,15,507
-661,16,507
-661,17,661
-661,18,661
-661,21,696
-661,22,696
-662,17,662
-662,18,662
-662,21,697
-662,22,697
-663,17,663
-663,18,663
-663,21,698
-663,22,698
-664,17,664
-664,18,664
-664,21,699
-664,22,699
-665,17,665
-665,18,665
-665,21,700
-665,22,700
-666,17,666
-666,18,666
-666,21,701
-666,22,701
-667,17,667
-667,18,667
-667,21,702
-667,22,702
-668,21,706
-668,22,706
-669,21,707
-669,22,707
-670,21,708
-670,22,708
-671,21,704
-671,22,704
-672,21,703
-672,22,703
-673,21,705
-673,22,705
+10001,10,410
+10001,12,496
+10001,13,496
+10001,14,496
+10001,15,496
+10001,16,496
+10001,17,650
+10001,18,650
+10001,21,685
+10001,22,685
+10002,11,410
+10002,12,497
+10002,13,497
+10002,14,497
+10002,15,497
+10002,16,497
+10002,17,651
+10002,18,651
+10002,21,686
+10002,22,686
+10003,9,410
+10003,12,498
+10003,13,498
+10003,14,498
+10003,15,498
+10003,16,498
+10003,17,652
+10003,18,652
+10003,21,687
+10003,22,687
+10004,12,499
+10004,13,499
+10004,14,499
+10004,15,499
+10004,16,499
+10004,17,653
+10004,18,653
+10004,21,688
+10004,22,688
+10005,12,500
+10005,13,500
+10005,14,500
+10005,15,500
+10005,16,500
+10005,17,654
+10005,18,654
+10005,21,689
+10005,22,689
+10006,14,502
+10006,15,502
+10006,16,502
+10006,17,655
+10006,18,655
+10006,21,690
+10006,22,690
+10007,14,501
+10007,15,501
+10007,16,501
+10007,17,656
+10007,18,656
+10007,21,691
+10007,22,691
+10008,14,503
+10008,15,503
+10008,16,503
+10008,17,657
+10008,18,657
+10008,21,692
+10008,22,692
+10009,14,504
+10009,15,504
+10009,16,504
+10009,17,658
+10009,18,658
+10009,21,693
+10009,22,693
+10010,14,505
+10010,15,505
+10010,16,505
+10010,17,659
+10010,18,659
+10010,21,694
+10010,22,694
+10011,14,506
+10011,15,506
+10011,16,506
+10011,17,660
+10011,18,660
+10011,21,695
+10011,22,695
+10012,14,507
+10012,15,507
+10012,16,507
+10012,17,661
+10012,18,661
+10012,21,696
+10012,22,696
+10013,17,662
+10013,18,662
+10013,21,697
+10013,22,697
+10014,17,663
+10014,18,663
+10014,21,698
+10014,22,698
+10015,17,664
+10015,18,664
+10015,21,699
+10015,22,699
+10016,17,665
+10016,18,665
+10016,21,700
+10016,22,700
+10017,17,666
+10017,18,666
+10017,21,701
+10017,22,701
+10018,17,667
+10018,18,667
+10018,21,702
+10018,22,702
+10019,21,706
+10019,22,706
+10020,21,707
+10020,22,707
+10021,21,708
+10021,22,708
+10022,21,704
+10022,22,704
+10023,21,703
+10023,22,703
+10024,21,705
+10024,22,705

pokedex/data/csv/pokemon_items.csv

@@ -2939,82 +2939,82 @@ pokemon_id,version_id,item_id,rarity
 648,18,91,100
 648,21,91,100
 648,22,91,100
-653,12,199,5
-653,13,199,5
-653,14,199,5
-653,15,199,5
-653,16,199,5
-653,17,199,5
-653,18,199,5
-653,21,199,5
-653,22,199,5
-654,12,199,5
-654,13,199,5
-654,14,199,5
-654,15,199,5
-654,16,199,5
-654,17,199,5
-654,18,199,5
-654,21,199,5
-654,22,199,5
-655,14,134,100
-655,15,134,100
-655,16,134,100
-655,17,134,100
-655,18,134,100
-655,21,134,100
-655,22,134,100
-662,7,220,100
-662,8,220,100
-662,9,220,100
-662,10,220,100
-662,11,220,100
-662,12,220,100
-662,13,220,100
-662,14,220,100
-662,15,220,100
-662,16,220,100
-662,17,220,100
-662,18,220,100
-662,21,220,100
-662,22,220,100
-663,7,220,100
-663,8,220,100
-663,9,220,100
-663,10,220,100
-663,11,220,100
-663,12,220,100
-663,13,220,100
-663,14,220,100
-663,15,220,100
-663,16,220,100
-663,17,220,100
-663,18,220,100
-663,21,220,100
-663,22,220,100
-664,7,220,100
-664,8,220,100
-664,9,220,100
-664,10,220,100
-664,11,220,100
-664,12,220,100
-664,13,220,100
-664,14,220,100
-664,15,220,100
-664,16,220,100
-664,17,220,100
-664,18,220,100
-664,21,220,100
-664,22,220,100
-665,17,204,5
-665,18,204,5
-665,21,204,5
-665,22,204,5
-666,17,129,50
-666,18,129,50
-666,21,129,50
-666,22,129,50
-667,17,91,100
-667,18,91,100
-667,21,91,100
-667,22,91,100
+10004,12,199,5
+10004,13,199,5
+10004,14,199,5
+10004,15,199,5
+10004,16,199,5
+10004,17,199,5
+10004,18,199,5
+10004,21,199,5
+10004,22,199,5
+10005,12,199,5
+10005,13,199,5
+10005,14,199,5
+10005,15,199,5
+10005,16,199,5
+10005,17,199,5
+10005,18,199,5
+10005,21,199,5
+10005,22,199,5
+10006,14,134,100
+10006,15,134,100
+10006,16,134,100
+10006,17,134,100
+10006,18,134,100
+10006,21,134,100
+10006,22,134,100
+10013,7,220,100
+10013,8,220,100
+10013,9,220,100
+10013,10,220,100
+10013,11,220,100
+10013,12,220,100
+10013,13,220,100
+10013,14,220,100
+10013,15,220,100
+10013,16,220,100
+10013,17,220,100
+10013,18,220,100
+10013,21,220,100
+10013,22,220,100
+10014,7,220,100
+10014,8,220,100
+10014,9,220,100
+10014,10,220,100
+10014,11,220,100
+10014,12,220,100
+10014,13,220,100
+10014,14,220,100
+10014,15,220,100
+10014,16,220,100
+10014,17,220,100
+10014,18,220,100
+10014,21,220,100
+10014,22,220,100
+10015,7,220,100
+10015,8,220,100
+10015,9,220,100
+10015,10,220,100
+10015,11,220,100
+10015,12,220,100
+10015,13,220,100
+10015,14,220,100
+10015,15,220,100
+10015,16,220,100
+10015,17,220,100
+10015,18,220,100
+10015,21,220,100
+10015,22,220,100
+10016,17,204,5
+10016,18,204,5
+10016,21,204,5
+10016,22,204,5
+10017,17,129,50
+10017,18,129,50
+10017,21,129,50
+10017,22,129,50
+10018,17,91,100
+10018,18,91,100
+10018,21,91,100
+10018,22,91,100

pokedex/data/csv/pokemon_species_names.csv

@@ -4081,3 +4081,72 @@ pokemon_species_id,local_language_id,name,genus
 649,5,Genesect,
 649,6,Genesect,
 649,9,Genesect,Paleozoic
+650,9,Chespin,
+651,9,Quilladin,
+652,9,Chesnaught,
+653,9,Fennekin,
+654,9,Braixen,
+655,9,Delphox,
+656,9,Froakie,
+657,9,Frogadier,
+658,9,Greninja,
+659,9,Bunnelby,
+660,9,Diggersby,
+661,9,Fletchling,
+662,9,Fletchinder,
+663,9,Talonflame,
+664,9,Scatterbug,
+665,9,Spewpa,
+666,9,Vivillon,
+667,9,Litleo,
+668,9,Pyroar,
+669,9,Flabébé,
+670,9,Floette,
+671,9,Florges,
+672,9,Skiddo,
+673,9,Gogoat,
+674,9,Pancham,
+675,9,Pangoro,
+676,9,Furfrou,
+677,9,Espurr,
+678,9,Meowstic,
+679,9,Honedge,
+680,9,Doublade,
+681,9,Aegislash,
+682,9,Spritzee,
+683,9,Aromatisse,
+684,9,Swirlix,
+685,9,Slurpuff,
+686,9,Inkay,
+687,9,Malamar,
+688,9,Binacle,
+689,9,Barbaracle,
+690,9,Skrelp,
+691,9,Dragalge,
+692,9,Clauncher,
+693,9,Clawitzer,
+694,9,Helioptile,
+695,9,Heliolisk,
+696,9,Tyrunt,
+697,9,Tyrantrum,
+698,9,Amaura,
+699,9,Aurorus,
+700,9,Sylveon,
+701,9,Hawlucha,
+702,9,Dedenne,
+703,9,Carbink,
+704,9,Goomy,
+705,9,Sliggoo,
+706,9,Goodra,
+707,9,Klefki,
+708,9,Phantump,
+709,9,Trevenant,
+710,9,Pumpkaboo,
+711,9,Gourgeist,
+712,9,Bergmite,
+713,9,Avalugg,
+714,9,Noibat,
+715,9,Noivern,
+716,9,Xerneas,
+717,9,Yveltal,
+718,9,Zygarde,

pokedex/data/csv/pokemon_stats.csv

@@ -3893,147 +3893,147 @@ pokemon_id,stat_id,base_stat,effort
 649,4,120,1
 649,5,95,0
 649,6,99,1
-650,1,50,0
-650,2,180,2
-650,3,20,0
-650,4,180,1
-650,5,20,0
-650,6,150,0
-651,1,50,0
-651,2,70,0
-651,3,160,2
-651,4,70,0
-651,5,160,1
-651,6,90,0
-652,1,50,0
-652,2,95,0
-652,3,90,0
-652,4,95,0
-652,5,90,0
-652,6,180,3
-653,1,60,0
-653,2,79,0
-653,3,105,2
-653,4,59,0
-653,5,85,0
-653,6,36,0
-654,1,60,0
-654,2,69,0
-654,3,95,1
-654,4,69,0
-654,5,95,1
-654,6,36,0
-655,1,100,0
-655,2,103,0
-655,3,75,0
-655,4,120,0
-655,5,75,0
-655,6,127,3
-656,1,150,3
-656,2,120,0
-656,3,100,0
-656,4,120,0
-656,5,100,0
-656,6,90,0
-657,1,50,0
-657,2,65,0
-657,3,107,0
-657,4,105,1
-657,5,107,0
-657,6,86,1
-658,1,50,0
-658,2,65,0
-658,3,107,0
-658,4,105,1
-658,5,107,0
-658,6,86,1
-659,1,50,0
-659,2,65,0
-659,3,107,0
-659,4,105,1
-659,5,107,0
-659,6,86,1
-660,1,50,0
-660,2,65,0
-660,3,107,0
-660,4,105,1
-660,5,107,0
-660,6,86,1
-661,1,50,0
-661,2,65,0
-661,3,107,0
-661,4,105,1
-661,5,107,0
-661,6,86,1
-662,1,70,1
-662,2,70,0
-662,3,70,0
-662,4,70,0
-662,5,70,0
-662,6,70,0
-663,1,70,1
-663,2,70,0
-663,3,70,0
-663,4,70,0
-663,5,70,0
-663,6,70,0
-664,1,70,1
-664,2,70,0
-664,3,70,0
-664,4,70,0
-664,5,70,0
-664,6,70,0
-665,1,70,0
-665,2,92,0
-665,3,65,0
-665,4,80,0
-665,5,55,0
-665,6,98,2
-666,1,105,0
-666,2,30,0
-666,3,105,0
-666,4,140,2
-666,5,105,0
-666,6,55,0
-667,1,100,0
-667,2,128,1
-667,3,90,1
-667,4,77,0
-667,5,77,0
-667,6,128,1
-668,1,79,0
-668,2,100,0
-668,3,80,0
-668,4,110,0
-668,5,90,0
-668,6,121,3
-669,1,79,0
-669,2,105,0
-669,3,70,0
-669,4,145,3
-669,5,80,0
-669,6,101,0
-670,1,89,0
-670,2,145,3
-670,3,90,0
-670,4,105,0
-670,5,80,0
-670,6,91,0
-671,1,125,0
-671,2,170,3
-671,3,100,0
-671,4,120,0
-671,5,90,0
-671,6,95,0
-672,1,125,0
-672,2,120,0
-672,3,90,0
-672,4,170,3
-672,5,100,0
-672,6,95,0
-673,1,91,0
-673,2,72,0
-673,3,90,0
-673,4,129,3
-673,5,90,0
-673,6,108,0
+10001,1,50,0
+10001,2,180,2
+10001,3,20,0
+10001,4,180,1
+10001,5,20,0
+10001,6,150,0
+10002,1,50,0
+10002,2,70,0
+10002,3,160,2
+10002,4,70,0
+10002,5,160,1
+10002,6,90,0
+10003,1,50,0
+10003,2,95,0
+10003,3,90,0
+10003,4,95,0
+10003,5,90,0
+10003,6,180,3
+10004,1,60,0
+10004,2,79,0
+10004,3,105,2
+10004,4,59,0
+10004,5,85,0
+10004,6,36,0
+10005,1,60,0
+10005,2,69,0
+10005,3,95,1
+10005,4,69,0
+10005,5,95,1
+10005,6,36,0
+10006,1,100,0
+10006,2,103,0
+10006,3,75,0
+10006,4,120,0
+10006,5,75,0
+10006,6,127,3
+10007,1,150,3
+10007,2,120,0
+10007,3,100,0
+10007,4,120,0
+10007,5,100,0
+10007,6,90,0
+10008,1,50,0
+10008,2,65,0
+10008,3,107,0
+10008,4,105,1
+10008,5,107,0
+10008,6,86,1
+10009,1,50,0
+10009,2,65,0
+10009,3,107,0
+10009,4,105,1
+10009,5,107,0
+10009,6,86,1
+10010,1,50,0
+10010,2,65,0
+10010,3,107,0
+10010,4,105,1
+10010,5,107,0
+10010,6,86,1
+10011,1,50,0
+10011,2,65,0
+10011,3,107,0
+10011,4,105,1
+10011,5,107,0
+10011,6,86,1
+10012,1,50,0
+10012,2,65,0
+10012,3,107,0
+10012,4,105,1
+10012,5,107,0
+10012,6,86,1
+10013,1,70,1
+10013,2,70,0
+10013,3,70,0
+10013,4,70,0
+10013,5,70,0
+10013,6,70,0
+10014,1,70,1
+10014,2,70,0
+10014,3,70,0
+10014,4,70,0
+10014,5,70,0
+10014,6,70,0
+10015,1,70,1
+10015,2,70,0
+10015,3,70,0
+10015,4,70,0
+10015,5,70,0
+10015,6,70,0
+10016,1,70,0
+10016,2,92,0
+10016,3,65,0
+10016,4,80,0
+10016,5,55,0
+10016,6,98,2
+10017,1,105,0
+10017,2,30,0
+10017,3,105,0
+10017,4,140,2
+10017,5,105,0
+10017,6,55,0
+10018,1,100,0
+10018,2,128,1
+10018,3,90,1
+10018,4,77,0
+10018,5,77,0
+10018,6,128,1
+10019,1,79,0
+10019,2,100,0
+10019,3,80,0
+10019,4,110,0
+10019,5,90,0
+10019,6,121,3
+10020,1,79,0
+10020,2,105,0
+10020,3,70,0
+10020,4,145,3
+10020,5,80,0
+10020,6,101,0
+10021,1,89,0
+10021,2,145,3
+10021,3,90,0
+10021,4,105,0
+10021,5,80,0
+10021,6,91,0
+10022,1,125,0
+10022,2,170,3
+10022,3,100,0
+10022,4,120,0
+10022,5,90,0
+10022,6,95,0
+10023,1,125,0
+10023,2,120,0
+10023,3,90,0
+10023,4,170,3
+10023,5,100,0
+10023,6,95,0
+10024,1,91,0
+10024,2,72,0
+10024,3,90,0
+10024,4,129,3
+10024,5,90,0
+10024,6,108,0

pokedex/data/csv/pokemon_types.csv

@@ -943,43 +943,213 @@ pokemon_id,type_id,slot
 648,14,2
 649,7,1
 649,9,2
-650,14,1
-651,14,1
-652,14,1
-653,7,1
-653,5,2
-654,7,1
-654,9,2
-655,12,1
-655,3,2
-656,8,1
-656,16,2
-657,13,1
-657,10,2
-658,13,1
-658,11,2
-659,13,1
-659,15,2
-660,13,1
-660,3,2
-661,13,1
-661,12,2
+650,12,1
+651,12,1
+652,12,1
+652,2,2
+653,10,1
+654,10,1
+655,10,1
+655,14,2
+656,11,1
+657,11,1
+658,11,1
+658,17,2
+659,1,1
+660,1,1
+660,5,2
+661,1,1
+661,3,2
 662,10,1
-663,11,1
-664,15,1
-665,11,1
-666,10,1
-666,14,2
-667,1,1
-667,2,2
-668,3,1
-669,13,1
-669,3,2
-670,5,1
-670,3,2
-671,16,1
-671,15,2
-672,16,1
-672,15,2
-673,11,1
-673,2,2
+662,3,2
+663,10,1
+663,3,2
+664,7,1
+665,7,1
+666,7,1
+666,3,2
+667,10,1
+667,1,2
+668,10,1
+668,1,2
+669,18,1
+670,18,1
+671,18,1
+672,12,1
+673,12,1
+674,2,1
+675,2,1
+675,17,2
+676,1,1
+677,14,1
+678,14,1
+679,8,1
+679,9,2
+680,8,1
+680,9,2
+681,8,1
+681,9,2
+682,18,1
+683,18,1
+684,18,1
+685,18,1
+686,17,1
+686,14,2
+687,17,1
+687,14,2
+688,11,1
+688,6,2
+689,11,1
+689,6,2
+690,4,1
+690,11,2
+691,4,1
+691,16,2
+692,11,1
+693,11,1
+694,13,1
+694,1,2
+695,13,1
+695,1,2
+696,6,1
+696,16,2
+697,6,1
+697,16,2
+698,6,1
+698,15,2
+699,6,1
+699,15,2
+700,18,1
+701,2,1
+701,3,2
+702,13,1
+702,18,2
+703,6,1
+703,18,2
+704,16,1
+705,16,1
+706,16,1
+707,18,1
+707,9,2
+708,8,1
+708,12,2
+709,8,1
+709,12,2
+710,8,1
+710,12,2
+711,8,1
+711,12,2
+712,15,1
+713,15,1
+714,3,1
+714,16,2
+715,3,1
+715,16,2
+716,18,1
+717,17,1
+717,3,2
+718,16,1
+718,5,2
+10001,14,1
+10002,14,1
+10003,14,1
+10004,7,1
+10004,5,2
+10005,7,1
+10005,9,2
+10006,12,1
+10006,3,2
+10007,8,1
+10007,16,2
+10008,13,1
+10008,10,2
+10009,13,1
+10009,11,2
+10010,13,1
+10010,15,2
+10011,13,1
+10011,3,2
+10012,13,1
+10012,12,2
+10013,10,1
+10014,11,1
+10015,15,1
+10016,11,1
+10017,10,1
+10017,14,2
+10018,1,1
+10018,2,2
+10019,3,1
+10020,13,1
+10020,3,2
+10021,5,1
+10021,3,2
+10022,16,1
+10022,15,2
+10023,16,1
+10023,15,2
+10024,11,1
+10024,2,2
+10025,14,1
+10026,8,1
+10026,9,2
+10027,8,1
+10027,12,2
+10028,8,1
+10028,12,2
+10029,8,1
+10029,12,2
+10030,8,1
+10030,12,2
+10031,8,1
+10031,12,2
+10032,8,1
+10032,12,2
+10033,12,1
+10033,4,2
+10034,10,1
+10034,16,2
+10035,10,1
+10035,3,2
+10036,11,1
+10037,14,1
+10038,8,1
+10038,4,2
+10039,1,1
+10040,7,1
+10040,3,2
+10041,11,1
+10041,17,2
+10042,6,1
+10042,3,2
+10043,14,1
+10043,2,2
+10044,14,1
+10045,13,1
+10045,16,2
+10046,7,1
+10046,9,2
+10047,7,1
+10047,2,2
+10048,17,1
+10048,10,2
+10049,6,1
+10049,17,2
+10050,10,1
+10050,2,2
+10051,14,1
+10051,18,2
+10052,9,1
+10052,18,2
+10053,9,1
+10054,2,1
+10054,14,2
+10055,13,1
+10056,8,1
+10057,17,1
+10058,16,1
+10058,5,2
+10059,2,1
+10059,9,2
+10060,12,1
+10060,15,2

pokedex/data/csv/region_names.csv

@@ -4,3 +4,4 @@ region_id,local_language_id,name
 3,9,Hoenn
 4,9,Sinnoh
 5,9,Unova
+6,9,Kalos

pokedex/data/csv/regions.csv

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

pokedex/data/csv/type_names.csv

@@ -101,6 +101,7 @@ type_id,local_language_id,name
 17,7,Siniestro
 17,8,Buio
 17,9,Dark
+18,9,Fairy
 10001,1,？？？
 10001,5,???
 10001,6,???

pokedex/data/csv/types.csv

@@ -16,5 +16,6 @@ id,identifier,generation_id,damage_class_id
 15,ice,1,3
 16,dragon,1,3
 17,dark,2,3
+18,fairy,6,
 10001,unknown,2,
 10002,shadow,3,

pokedex/data/csv/version_groups.csv

@@ -13,3 +13,4 @@ id,generation_id,pokedex_id,order
 12,3,,7
 13,3,,8
 14,5,9,14
+15,6,12,15

pokedex/data/csv/version_names.csv

@@ -21,3 +21,5 @@ version_id,local_language_id,name
 20,9,XD
 21,9,Black 2
 22,9,White 2
+23,9,X
+24,9,Y

pokedex/data/csv/versions.csv

@@ -21,3 +21,5 @@ id,version_group_id,identifier
 20,13,xd
 21,14,black-2
 22,14,white-2
+23,15,x
+24,15,y

pokedex/db/tables.py

@@ -862,8 +862,6 @@ class Generation(TableBase):
         info=dict(description="A numeric ID"))
     main_region_id = Column(Integer, ForeignKey('regions.id'), nullable=False,
         info=dict(description="ID of the region this generation's main games take place in"))
-    canonical_pokedex_id = Column(Integer, ForeignKey('pokedexes.id'), nullable=False,
-        info=dict(description=u"ID of the Pokédex this generation's main games use by default"))
     identifier = Column(Unicode(16), nullable=False,
         info=dict(description=u'An identifier', format='identifier'))
 
@@ -1517,6 +1515,8 @@ class Pokemon(TableBase):
     __singlename__ = 'pokemon'
     id = Column(Integer, primary_key=True, nullable=False,
         info=dict(description=u"A numeric ID"))
+    identifier = Column(Unicode(30), nullable=False,
+        info=dict(description=u'An identifier, including form iff this row corresponds to a single, named form', format='identifier'))
     species_id = Column(Integer, ForeignKey('pokemon_species.id'),
         info=dict(description=u"ID of the species this Pokémon belongs to"))
     height = Column(Integer, nullable=False,
@@ -1674,6 +1674,8 @@ class PokemonForm(TableBase):
     __singlename__ = 'pokemon_form'
     id = Column(Integer, primary_key=True, nullable=False,
         info=dict(description=u'A unique ID for this form.'))
+    identifier = Column(Unicode(30), nullable=False,
+        info=dict(description=u"A unique identifier for this form among all forms of all Pokémon", format='identifier'))
     form_identifier = Column(Unicode(16), nullable=True,
         info=dict(description=u"An identifier of the form, uniue among a species. May be None for the default form of the species.", format='identifier'))
     pokemon_id = Column(Integer, ForeignKey('pokemon.id'), nullable=False, autoincrement=False,
@@ -2273,8 +2275,6 @@ Experience.growth_rate = relationship(GrowthRate,
     backref='experience_table')
 
 
-Generation.canonical_pokedex = relationship(Pokedex,
-    backref='canonical_for_generation')
 Generation.versions = relationship(Version,
     secondary=VersionGroup.__table__,
     innerjoin=True)
@@ -2372,7 +2372,7 @@ Move.generation = relationship(Generation,
 Move.machines = relationship(Machine,
     backref='move')
 Move.meta = relationship(MoveMeta,
-    uselist=False, innerjoin=True,
+    uselist=False,
     backref='move')
 Move.meta_stat_changes = relationship(MoveMetaStatChange)
 Move.move_effect = relationship(MoveEffect,
@@ -2483,7 +2483,6 @@ Pokedex.version_groups = relationship(VersionGroup,
 Pokemon.all_abilities = relationship(Ability,
     secondary=PokemonAbility.__table__,
     order_by=PokemonAbility.slot.asc(),
-    innerjoin=True,
     backref=backref('all_pokemon', order_by=Pokemon.order.asc()),
     doc=u"All abilities the Pokémon can have, including the Hidden Ability")
 Pokemon.abilities = relationship(Ability,
@@ -2492,7 +2491,6 @@ Pokemon.abilities = relationship(Ability,
         Pokemon.id == PokemonAbility.pokemon_id,
         PokemonAbility.is_hidden == False,
     ),
-    innerjoin=True,
     order_by=PokemonAbility.slot.asc(),
     backref=backref('pokemon', order_by=Pokemon.order.asc()),
     doc=u"Abilities the Pokémon can have in the wild")
@@ -2507,7 +2505,6 @@ Pokemon.hidden_ability = relationship(Ability,
     doc=u"The Pokémon's Hidden Ability")
 Pokemon.pokemon_abilities = relationship(PokemonAbility,
     order_by=PokemonAbility.slot.asc(),
-    innerjoin=True,
     backref=backref('pokemon', order_by=Pokemon.order.asc()),
     doc=u"All abilities the Pokémon can have, as bridge rows")
 Pokemon.forms = relationship(PokemonForm,
@@ -2525,7 +2522,6 @@ Pokemon.items = relationship(PokemonItem,
     order_by=PokemonItem.rarity.desc(),
     doc=u"Info about items this pokémon holds in the wild")
 Pokemon.stats = relationship(PokemonStat,
-    innerjoin=True,
     order_by=PokemonStat.stat_id.asc(),
     backref='pokemon')
 Pokemon.species = relationship(PokemonSpecies,
@@ -2634,7 +2630,6 @@ PokemonSpecies.color = relationship(PokemonColor,
     backref='species')
 PokemonSpecies.egg_groups = relationship(EggGroup,
     secondary=PokemonEggGroup.__table__,
-    innerjoin=True,
     order_by=PokemonEggGroup.egg_group_id.asc(),
     backref=backref('species', order_by=PokemonSpecies.order.asc()))
 PokemonSpecies.forms = relationship(PokemonForm,
@@ -2656,7 +2651,6 @@ PokemonSpecies.default_pokemon = relationship(Pokemon,
         Pokemon.is_default==True),
     uselist=False, lazy='joined')
 PokemonSpecies.evolution_chain = relationship(EvolutionChain,
-    innerjoin=True,
     backref=backref('species', order_by=PokemonSpecies.id.asc()))
 PokemonSpecies.dex_numbers = relationship(PokemonDexNumber,
     innerjoin=True,