From 1787d89baa2ef637dbabe5c7c0e43696551dec1b Mon Sep 17 00:00:00 2001
From: "Lynn \"Zhorken\" Vaughan" <zhorken@gmail.com>
Date: Thu, 21 Jun 2012 14:44:35 -0400
Subject: [PATCH] Add Keldeo's resolution form.

I'm calling it "form" instead of "forme" because it's sugata, not forumu.
---
 pokedex/data/csv/pokemon.csv            | 1 +
 pokedex/data/csv/pokemon_form_names.csv | 3 ++-
 pokedex/data/csv/pokemon_forms.csv      | 3 ++-
 pokedex/data/csv/pokemon_stats.csv      | 6 ++++++
 pokedex/data/csv/pokemon_types.csv      | 1 +
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pokedex/data/csv/pokemon.csv b/pokedex/data/csv/pokemon.csv
index 18a6bf6..a21e5cf 100644
--- a/pokedex/data/csv/pokemon.csv
+++ b/pokedex/data/csv/pokemon.csv
@@ -671,3 +671,4 @@ id,species_id,height,weight,base_experience,order,is_default
 670,645,0,0,0,670,0
 671,646,0,0,0,671,0
 672,646,0,0,0,672,0
+673,647,0,0,0,673,0
diff --git a/pokedex/data/csv/pokemon_form_names.csv b/pokedex/data/csv/pokemon_form_names.csv
index 95cfd22..c7703ac 100644
--- a/pokedex/data/csv/pokemon_form_names.csv
+++ b/pokedex/data/csv/pokemon_form_names.csv
@@ -1292,7 +1292,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 646,5,,
 646,9,,
 647,5,,
-647,9,,
+647,9,usual form,usual Keldeo
 648,5,Forme Chant,Meloetta Chant
 648,9,Aria Forme,Aria Meloetta
 649,5,,
@@ -1458,3 +1458,4 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 730,9,reijuu forme,reijuu Landorus
 731,9,Black forme,Black Kyurem
 732,9,White forme,White Kyurem
+733,9,resolution form,resolution Keldeo
diff --git a/pokedex/data/csv/pokemon_forms.csv b/pokedex/data/csv/pokemon_forms.csv
index 85d4254..2238f1f 100644
--- a/pokedex/data/csv/pokemon_forms.csv
+++ b/pokedex/data/csv/pokemon_forms.csv
@@ -645,7 +645,7 @@ id,form_identifier,pokemon_id,introduced_in_version_group_id,is_default,is_battl
 644,,644,11,1,0,1,701
 645,,645,11,1,0,1,702
 646,,646,11,1,0,1,703
-647,,647,11,1,0,1,704
+647,usual,647,11,1,0,1,704
 648,aria,648,11,1,0,1,705
 649,,649,11,1,0,1,707
 650,b,201,3,0,0,2,232
@@ -731,3 +731,4 @@ id,form_identifier,pokemon_id,introduced_in_version_group_id,is_default,is_battl
 730,reijuu,670,14,1,0,2,711
 731,black,671,14,1,0,2,712
 732,white,672,14,1,0,3,713
+733,resolution,673,14,1,0,2,714
diff --git a/pokedex/data/csv/pokemon_stats.csv b/pokedex/data/csv/pokemon_stats.csv
index 47be5fa..310d963 100644
--- a/pokedex/data/csv/pokemon_stats.csv
+++ b/pokedex/data/csv/pokemon_stats.csv
@@ -4031,3 +4031,9 @@ pokemon_id,stat_id,base_stat,effort
 672,4,0,0
 672,5,0,0
 672,6,0,0
+673,1,0,0
+673,2,0,0
+673,3,0,0
+673,4,0,0
+673,5,0,0
+673,6,0,0
diff --git a/pokedex/data/csv/pokemon_types.csv b/pokedex/data/csv/pokemon_types.csv
index 8a04636..91f967f 100644
--- a/pokedex/data/csv/pokemon_types.csv
+++ b/pokedex/data/csv/pokemon_types.csv
@@ -977,3 +977,4 @@ pokemon_id,type_id,slot
 670,10001,1
 671,10001,1
 672,10001,1
+673,10001,1