Fixed Deoxys's gen 3 form moves. #31

Only the version group a forme actually exists in now has any moves for
that forme.

In addition, Deoxys formes were not showing any gen 3 moves at all
previously, because they were marked as only existing in gen 4.  This
has been fixed.

diff --git a/pokedex/data/csv/pokemon.csv b/pokedex/data/csv/pokemon.csv
index 6b06b6d..e3be5d3 100644 (file)
--- a/pokedex/data/csv/pokemon.csv
+++ b/pokedex/data/csv/pokemon.csv
@@ -492,9 +492,9 @@ id,name,forme_name,forme_base_pokemon_id,generation_id,evolution_chain_id,evolut
 491,Darkrai,,,4,252,,,,15,505,Pitch-Black,black,12,,-1,3,210,0,,0,0,0
 492,Shaymin,land,,4,253,,,,2,21,Gratitude,green,8,,-1,45,64,100,,0,0,0
 493,Arceus,,,4,254,,,,32,3200,Alpha,gray,8,,-1,3,255,0,,0,0,0
-496,Deoxys,attack,386,4,202,,,,17,608,DNA,red,12,rare,-1,3,215,0,,0,0,0
-497,Deoxys,defense,386,4,202,,,,17,608,DNA,red,12,rare,-1,3,215,0,,0,0,0
-498,Deoxys,speed,386,4,202,,,,17,608,DNA,red,12,rare,-1,3,215,0,,0,0,0
+496,Deoxys,attack,386,3,202,,,,17,608,DNA,red,12,rare,-1,3,215,0,,0,0,0
+497,Deoxys,defense,386,3,202,,,,17,608,DNA,red,12,rare,-1,3,215,0,,0,0,0
+498,Deoxys,speed,386,3,202,,,,17,608,DNA,red,12,rare,-1,3,215,0,,0,0,0
 499,Wormadam,sandy,413,4,213,412,3,20,5,65,Bagworm,gray,2,,8,45,159,70,,0,0,0
 500,Wormadam,trash,413,4,213,412,3,20,5,65,Bagworm,gray,2,,8,45,159,70,,0,0,0
 501,Giratina,origin,487,4,248,,,,69,6500,Renegade,black,10,,-1,3,220,0,,0,0,0

diff --git a/pokedex/data/csv/pokemon_moves.csv b/pokedex/data/csv/pokemon_moves.csv
index bf587b0..0bedd96 100644 (file)
--- a/pokedex/data/csv/pokemon_moves.csv
+++ b/pokedex/data/csv/pokemon_moves.csv
@@ -138905,15 +138905,22 @@ pokemon_id,version_group_id,move_id,pokemon_move_method_id,level,order
 385,10,447,4,0,
 385,10,451,4,0,
 386,5,15,4,0,
+386,5,35,1,1,2
+386,5,43,1,1,1
 386,5,58,4,0,
+386,5,63,1,50,
 386,5,63,4,0,
 386,5,70,4,0,
 386,5,76,4,0,
 386,5,85,4,0,
 386,5,87,4,0,
 386,5,92,4,0,
+386,5,94,1,25,
 386,5,94,4,0,
+386,5,100,1,10,
+386,5,101,1,5,
 386,5,104,4,0,
+386,5,105,1,40,
 386,5,113,4,0,
 386,5,115,4,0,
 386,5,148,4,0,
@@ -138922,6 +138929,7 @@ pokemon_id,version_group_id,move_id,pokemon_move_method_id,level,order
 386,5,216,4,0,
 386,5,218,4,0,
 386,5,219,4,0,
+386,5,228,1,20,
 386,5,237,4,0,
 386,5,240,4,0,
 386,5,241,4,0,
@@ -138932,120 +138940,18 @@ pokemon_id,version_group_id,move_id,pokemon_move_method_id,level,order
 386,5,264,4,0,
 386,5,269,4,0,
 386,5,280,4,0,
+386,5,282,1,15,
 386,5,285,4,0,
+386,5,289,1,30,
 386,5,289,4,0,
 386,5,290,4,0,
 386,5,317,4,0,
+386,5,322,1,35,
 386,5,332,4,0,
 386,5,347,4,0,
 386,5,351,4,0,
 386,5,352,4,0,
-386,6,5,3,0,
-386,6,7,3,0,
-386,6,8,3,0,
-386,6,9,3,0,
-386,6,15,4,0,
-386,6,25,3,0,
-386,6,34,3,0,
-386,6,38,3,0,
-386,6,58,4,0,
-386,6,63,4,0,
-386,6,68,3,0,
-386,6,69,3,0,
-386,6,70,4,0,
-386,6,76,4,0,
-386,6,85,4,0,
-386,6,86,3,0,
-386,6,87,4,0,
-386,6,92,4,0,
-386,6,94,4,0,
-386,6,102,3,0,
-386,6,104,4,0,
-386,6,113,4,0,
-386,6,115,4,0,
-386,6,129,3,0,
-386,6,138,3,0,
-386,6,148,4,0,
-386,6,156,4,0,
-386,6,157,3,0,
-386,6,164,3,0,
-386,6,173,3,0,
-386,6,182,4,0,
-386,6,189,3,0,
-386,6,196,3,0,
-386,6,203,3,0,
-386,6,207,3,0,
-386,6,214,3,0,
-386,6,216,4,0,
-386,6,218,4,0,
-386,6,219,4,0,
-386,6,223,3,0,
-386,6,237,4,0,
-386,6,240,4,0,
-386,6,241,4,0,
-386,6,244,3,0,
-386,6,247,4,0,
-386,6,249,4,0,
-386,6,259,4,0,
-386,6,263,4,0,
-386,6,264,4,0,
-386,6,269,4,0,
-386,6,280,4,0,
-386,6,285,4,0,
-386,6,289,4,0,
-386,6,290,4,0,
-386,6,317,4,0,
-386,6,332,4,0,
-386,6,347,4,0,
-386,6,351,4,0,
-386,6,352,4,0,
-386,7,5,3,0,
-386,7,15,4,0,
-386,7,25,3,0,
-386,7,34,3,0,
-386,7,38,3,0,
-386,7,58,4,0,
-386,7,63,4,0,
-386,7,68,3,0,
-386,7,69,3,0,
-386,7,70,4,0,
-386,7,76,4,0,
-386,7,85,4,0,
-386,7,86,3,0,
-386,7,87,4,0,
-386,7,92,4,0,
-386,7,94,4,0,
-386,7,102,3,0,
-386,7,104,4,0,
-386,7,113,4,0,
-386,7,115,4,0,
-386,7,138,3,0,
-386,7,148,4,0,
-386,7,156,4,0,
-386,7,157,3,0,
-386,7,164,3,0,
-386,7,182,4,0,
-386,7,216,4,0,
-386,7,218,4,0,
-386,7,219,4,0,
-386,7,237,4,0,
-386,7,240,4,0,
-386,7,241,4,0,
-386,7,247,4,0,
-386,7,249,4,0,
-386,7,259,4,0,
-386,7,263,4,0,
-386,7,264,4,0,
-386,7,269,4,0,
-386,7,280,4,0,
-386,7,285,4,0,
-386,7,289,4,0,
-386,7,290,4,0,
-386,7,317,4,0,
-386,7,332,4,0,
-386,7,347,4,0,
-386,7,351,4,0,
-386,7,352,4,0,
+386,5,354,1,45,
 386,8,15,4,0,
 386,8,35,1,1,2
 386,8,43,1,1,1
@@ -157223,84 +157129,12 @@ pokemon_id,version_group_id,move_id,pokemon_move_method_id,level,order
 493,10,447,4,0,
 493,10,449,1,100,
 493,10,451,4,0,
-496,5,15,4,0,
-496,5,58,4,0,
-496,5,63,4,0,
-496,5,70,4,0,
-496,5,76,4,0,
-496,5,85,4,0,
-496,5,87,4,0,
-496,5,92,4,0,
-496,5,94,4,0,
-496,5,104,4,0,
-496,5,113,4,0,
-496,5,115,4,0,
-496,5,148,4,0,
-496,5,156,4,0,
-496,5,182,4,0,
-496,5,216,4,0,
-496,5,218,4,0,
-496,5,219,4,0,
-496,5,237,4,0,
-496,5,240,4,0,
-496,5,241,4,0,
-496,5,247,4,0,
-496,5,249,4,0,
-496,5,259,4,0,
-496,5,263,4,0,
-496,5,264,4,0,
-496,5,269,4,0,
-496,5,280,4,0,
-496,5,285,4,0,
-496,5,289,4,0,
-496,5,290,4,0,
-496,5,317,4,0,
-496,5,332,4,0,
-496,5,347,4,0,
-496,5,351,4,0,
-496,5,352,4,0,
-496,6,15,4,0,
-496,6,58,4,0,
-496,6,63,4,0,
-496,6,70,4,0,
-496,6,76,4,0,
-496,6,85,4,0,
-496,6,87,4,0,
-496,6,92,4,0,
-496,6,94,4,0,
-496,6,104,4,0,
-496,6,113,4,0,
-496,6,115,4,0,
-496,6,148,4,0,
-496,6,156,4,0,
-496,6,182,4,0,
-496,6,216,4,0,
-496,6,218,4,0,
-496,6,219,4,0,
-496,6,237,4,0,
-496,6,240,4,0,
-496,6,241,4,0,
-496,6,247,4,0,
-496,6,249,4,0,
-496,6,259,4,0,
-496,6,263,4,0,
-496,6,264,4,0,
-496,6,269,4,0,
-496,6,280,4,0,
-496,6,285,4,0,
-496,6,289,4,0,
-496,6,290,4,0,
-496,6,317,4,0,
-496,6,332,4,0,
-496,6,347,4,0,
-496,6,351,4,0,
-496,6,352,4,0,
 496,7,15,4,0,
 496,7,35,1,1,2
 496,7,43,1,1,1
 496,7,58,4,0,
+496,7,63,1,50,
 496,7,63,4,0,
-496,7,68,1,50,
 496,7,70,4,0,
 496,7,76,4,0,
 496,7,85,4,0,
@@ -157311,36 +157145,34 @@ pokemon_id,version_group_id,move_id,pokemon_move_method_id,level,order
 496,7,100,1,10,
 496,7,101,1,5,
 496,7,104,4,0,
-496,7,105,1,40,
 496,7,113,4,0,
 496,7,115,4,0,
-496,7,133,1,35,3
 496,7,148,4,0,
 496,7,156,4,0,
 496,7,182,4,0,
-496,7,191,1,20,
+496,7,192,1,40,
 496,7,216,4,0,
 496,7,218,4,0,
 496,7,219,4,0,
+496,7,228,1,20,
 496,7,237,4,0,
 496,7,240,4,0,
 496,7,241,4,0,
-496,7,243,1,50,4
 496,7,247,4,0,
 496,7,249,4,0,
 496,7,259,4,0,
 496,7,263,4,0,
 496,7,264,4,0,
+496,7,269,1,15,
 496,7,269,4,0,
+496,7,276,1,30,
 496,7,280,4,0,
-496,7,282,1,15,
 496,7,285,4,0,
-496,7,289,1,30,
 496,7,289,4,0,
 496,7,290,4,0,
 496,7,317,4,0,
+496,7,322,1,35,
 496,7,332,4,0,
-496,7,334,1,35,
 496,7,347,4,0,
 496,7,351,4,0,
 496,7,352,4,0,
@@ -157572,99 +157404,37 @@ pokemon_id,version_group_id,move_id,pokemon_move_method_id,level,order
 496,10,446,4,0,
 496,10,447,4,0,
 496,10,451,4,0,
-497,5,15,4,0,
-497,5,58,4,0,
-497,5,63,4,0,
-497,5,70,4,0,
-497,5,76,4,0,
-497,5,85,4,0,
-497,5,87,4,0,
-497,5,92,4,0,
-497,5,94,4,0,
-497,5,104,4,0,
-497,5,113,4,0,
-497,5,115,4,0,
-497,5,148,4,0,
-497,5,156,4,0,
-497,5,182,4,0,
-497,5,216,4,0,
-497,5,218,4,0,
-497,5,219,4,0,
-497,5,237,4,0,
-497,5,240,4,0,
-497,5,241,4,0,
-497,5,247,4,0,
-497,5,249,4,0,
-497,5,259,4,0,
-497,5,263,4,0,
-497,5,264,4,0,
-497,5,269,4,0,
-497,5,280,4,0,
-497,5,285,4,0,
-497,5,289,4,0,
-497,5,290,4,0,
-497,5,317,4,0,
-497,5,332,4,0,
-497,5,347,4,0,
-497,5,351,4,0,
-497,5,352,4,0,
-497,6,15,4,0,
-497,6,58,4,0,
-497,6,63,4,0,
-497,6,70,4,0,
-497,6,76,4,0,
-497,6,85,4,0,
-497,6,87,4,0,
-497,6,92,4,0,
-497,6,94,4,0,
-497,6,104,4,0,
-497,6,113,4,0,
-497,6,115,4,0,
-497,6,148,4,0,
-497,6,156,4,0,
-497,6,182,4,0,
-497,6,216,4,0,
-497,6,218,4,0,
-497,6,219,4,0,
-497,6,237,4,0,
-497,6,240,4,0,
-497,6,241,4,0,
-497,6,247,4,0,
-497,6,249,4,0,
-497,6,259,4,0,
-497,6,263,4,0,
-497,6,264,4,0,
-497,6,269,4,0,
-497,6,280,4,0,
-497,6,285,4,0,
-497,6,289,4,0,
-497,6,290,4,0,
-497,6,317,4,0,
-497,6,332,4,0,
-497,6,347,4,0,
-497,6,351,4,0,
-497,6,352,4,0,
 497,7,15,4,0,
+497,7,35,1,1,2
+497,7,43,1,1,1
 497,7,58,4,0,
 497,7,63,4,0,
+497,7,68,1,50,1
 497,7,70,4,0,
 497,7,76,4,0,
 497,7,85,4,0,
 497,7,87,4,0,
 497,7,92,4,0,
+497,7,94,1,25,
 497,7,94,4,0,
+497,7,100,1,10,
+497,7,101,1,5,
 497,7,104,4,0,
+497,7,105,1,40,
 497,7,113,4,0,
 497,7,115,4,0,
+497,7,133,1,35,2
 497,7,148,4,0,
 497,7,156,4,0,
 497,7,182,4,0,
+497,7,191,1,20,
 497,7,216,4,0,
 497,7,218,4,0,
 497,7,219,4,0,
 497,7,237,4,0,
 497,7,240,4,0,
 497,7,241,4,0,
+497,7,243,1,50,2
 497,7,247,4,0,
 497,7,249,4,0,
 497,7,259,4,0,
@@ -157672,14 +157442,18 @@ pokemon_id,version_group_id,move_id,pokemon_move_method_id,level,order
 497,7,264,4,0,
 497,7,269,4,0,
 497,7,280,4,0,
+497,7,282,1,15,
 497,7,285,4,0,
+497,7,289,1,30,
 497,7,289,4,0,
 497,7,290,4,0,
 497,7,317,4,0,
 497,7,332,4,0,
+497,7,334,1,35,1
 497,7,347,4,0,
 497,7,351,4,0,
 497,7,352,4,0,
+497,7,354,1,45,
 497,8,15,4,0,
 497,8,35,1,1,2
 497,8,43,1,1,1
@@ -157913,54 +157687,6 @@ pokemon_id,version_group_id,move_id,pokemon_move_method_id,level,order
 497,10,446,4,0,
 497,10,447,4,0,
 497,10,451,4,0,
-498,5,15,4,0,
-498,5,35,1,1,2
-498,5,43,1,1,1
-498,5,58,4,0,
-498,5,63,1,50,
-498,5,63,4,0,
-498,5,70,4,0,
-498,5,76,4,0,
-498,5,85,4,0,
-498,5,87,4,0,
-498,5,92,4,0,
-498,5,94,1,25,
-498,5,94,4,0,
-498,5,100,1,10,
-498,5,101,1,5,
-498,5,104,4,0,
-498,5,105,1,40,
-498,5,113,4,0,
-498,5,115,4,0,
-498,5,148,4,0,
-498,5,156,4,0,
-498,5,182,4,0,
-498,5,216,4,0,
-498,5,218,4,0,
-498,5,219,4,0,
-498,5,228,1,20,
-498,5,237,4,0,
-498,5,240,4,0,
-498,5,241,4,0,
-498,5,247,4,0,
-498,5,249,4,0,
-498,5,259,4,0,
-498,5,263,4,0,
-498,5,264,4,0,
-498,5,269,4,0,
-498,5,280,4,0,
-498,5,282,1,15,
-498,5,285,4,0,
-498,5,289,1,30,
-498,5,289,4,0,
-498,5,290,4,0,
-498,5,317,4,0,
-498,5,322,1,35,
-498,5,332,4,0,
-498,5,347,4,0,
-498,5,351,4,0,
-498,5,352,4,0,
-498,5,354,1,45,
 498,6,15,4,0,
 498,6,35,1,1,2
 498,6,43,1,1,1
@@ -158009,42 +157735,6 @@ pokemon_id,version_group_id,move_id,pokemon_move_method_id,level,order
 498,6,351,4,0,
 498,6,352,4,0,
 498,6,354,1,45,
-498,7,15,4,0,
-498,7,58,4,0,
-498,7,63,4,0,
-498,7,70,4,0,
-498,7,76,4,0,
-498,7,85,4,0,
-498,7,87,4,0,
-498,7,92,4,0,
-498,7,94,4,0,
-498,7,104,4,0,
-498,7,113,4,0,
-498,7,115,4,0,
-498,7,148,4,0,
-498,7,156,4,0,
-498,7,182,4,0,
-498,7,216,4,0,
-498,7,218,4,0,
-498,7,219,4,0,
-498,7,237,4,0,
-498,7,240,4,0,
-498,7,241,4,0,
-498,7,247,4,0,
-498,7,249,4,0,
-498,7,259,4,0,
-498,7,263,4,0,
-498,7,264,4,0,
-498,7,269,4,0,
-498,7,280,4,0,
-498,7,285,4,0,
-498,7,289,4,0,
-498,7,290,4,0,
-498,7,317,4,0,
-498,7,332,4,0,
-498,7,347,4,0,
-498,7,351,4,0,
-498,7,352,4,0,
 498,8,15,4,0,
 498,8,35,1,1,2
 498,8,43,1,1,1