From 82679b70ead372d27fb52e2a7e3328de46b38865 Mon Sep 17 00:00:00 2001
From: "Eevee (Lexy Munroe)" <eevee.git@veekun.com>
Date: Sat, 25 Nov 2017 12:07:12 -0800
Subject: [PATCH] =?UTF-8?q?Add=20Pok=C3=A9mon=20form=20names=20and=20a=20c?=
 =?UTF-8?q?ouple=20minor=20tidbits?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pokedex/data/csv/pokemon_form_names.csv        | 18 +++++++++---------
 pokedex/data/csv/pokemon_moves.csv             |  7 +++++++
 .../csv/version_group_pokemon_move_methods.csv |  6 ++++++
 pokedex/data/csv/version_group_regions.csv     |  1 +
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/pokedex/data/csv/pokemon_form_names.csv b/pokedex/data/csv/pokemon_form_names.csv
index 86a00a1..6281cf0 100644
--- a/pokedex/data/csv/pokemon_form_names.csv
+++ b/pokedex/data/csv/pokemon_form_names.csv
@@ -3063,7 +3063,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10231,6,,
 10231,7,,
 10231,8,,
-10231,9,,Salazzle Lurantis
+10231,9,,Totem Salazzle
 10231,11,,
 10231,12,,
 10249,1,りゅうせいのすがた,
@@ -3273,7 +3273,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10309,6,,
 10309,7,,
 10309,8,,
-10309,9,,
+10309,9,,Totem Ribombee
 10309,11,,
 10309,12,,
 10310,1,,
@@ -3283,7 +3283,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10310,6,,
 10310,7,,
 10310,8,,
-10310,9,,
+10310,9,,Own Tempo Rockruff
 10310,11,,
 10310,12,,
 10311,1,たそがれのすがた,
@@ -3293,7 +3293,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10311,6,Zwielichtform,
 10311,7,Forma Crepuscular,
 10311,8,Forma Crepuscolo,
-10311,9,Dusk Form,
+10311,9,Dusk Form,Dusk Lycanroc
 10311,11,たそがれのすがた,
 10311,12,黄昏的样子,
 10312,1,,
@@ -3303,7 +3303,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10312,6,,
 10312,7,,
 10312,8,,
-10312,9,,
+10312,9,,Totem Araquanid
 10312,11,,
 10312,12,,
 10313,1,,
@@ -3313,7 +3313,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10313,6,,
 10313,7,,
 10313,8,,
-10313,9,,
+10313,9,,Totem Togedemaru
 10313,11,,
 10313,12,,
 10314,1,たそがれのたてがみ,
@@ -3323,7 +3323,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10314,6,Abendmähne,
 10314,7,Melena Crepuscular,
 10314,8,Criniera del Vespro,
-10314,9,Dusk Mane,
+10314,9,Dusk Mane,Dusk Necrozma
 10314,11,たそがれのたてがみ,
 10314,12,黄昏之鬃,
 10315,1,あかつきのつばさ,
@@ -3333,7 +3333,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10315,6,Morgenschwingen,
 10315,7,Alas del Alba,
 10315,8,Ali dell’Aurora,
-10315,9,Dawn Wings,
+10315,9,Dawn Wings,Dawn Necrozma
 10315,11,あかつきのつばさ,
 10315,12,拂晓之翼,
 10316,1,ウルトラネクロズマ,
@@ -3343,6 +3343,6 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10316,6,Ultra-Necrozma,
 10316,7,Ultra-Necrozma,
 10316,8,UltraNecrozma,
-10316,9,Ultra Necrozma,
+10316,9,Ultra Necrozma,Ultra Necrozma
 10316,11,ウルトラネクロズマ,
 10316,12,究极奈克洛兹玛,
diff --git a/pokedex/data/csv/pokemon_moves.csv b/pokedex/data/csv/pokemon_moves.csv
index 6fb7068..26fd0d1 100644
--- a/pokedex/data/csv/pokemon_moves.csv
+++ b/pokedex/data/csv/pokemon_moves.csv
@@ -142032,6 +142032,7 @@ pokemon_id,version_group_id,move_id,pokemon_move_method_id,level,order
 172,18,268,2,0,
 172,18,273,2,0,
 172,18,321,2,0,
+172,18,344,6,0,
 172,18,374,4,0,
 172,18,381,2,0,
 172,18,417,1,13,
@@ -349671,6 +349672,7 @@ pokemon_id,version_group_id,move_id,pokemon_move_method_id,level,order
 479,17,521,4,0,
 479,17,590,4,0,
 479,18,84,1,1,6
+479,18,84,10,0,
 479,18,85,4,0,
 479,18,86,1,1,5
 479,18,86,4,0,
@@ -438538,6 +438540,7 @@ pokemon_id,version_group_id,move_id,pokemon_move_method_id,level,order
 10008,18,268,1,57,
 10008,18,271,1,1,3
 10008,18,310,1,1,4
+10008,18,315,10,0,
 10008,18,351,1,22,
 10008,18,399,4,0,
 10008,18,435,1,1,1
@@ -438898,6 +438901,7 @@ pokemon_id,version_group_id,move_id,pokemon_move_method_id,level,order
 10009,17,506,1,50,
 10009,17,521,4,0,
 10009,17,590,4,0,
+10009,18,56,10,0,
 10009,18,84,1,1,6
 10009,18,85,4,0,
 10009,18,86,1,1,5
@@ -439291,6 +439295,7 @@ pokemon_id,version_group_id,move_id,pokemon_move_method_id,level,order
 10010,17,506,1,50,
 10010,17,521,4,0,
 10010,17,590,4,0,
+10010,18,59,10,0,
 10010,18,84,1,1,6
 10010,18,85,4,0,
 10010,18,86,1,1,5
@@ -439719,6 +439724,7 @@ pokemon_id,version_group_id,move_id,pokemon_move_method_id,level,order
 10011,18,310,1,1,4
 10011,18,351,1,22,
 10011,18,399,4,0,
+10011,18,403,10,0,
 10011,18,435,1,1,1
 10011,18,435,1,64,
 10011,18,451,4,0,
@@ -440114,6 +440120,7 @@ pokemon_id,version_group_id,move_id,pokemon_move_method_id,level,order
 10012,18,399,4,0,
 10012,18,435,1,1,1
 10012,18,435,1,64,
+10012,18,437,10,0,
 10012,18,451,4,0,
 10012,18,466,1,29,
 10012,18,486,1,43,
diff --git a/pokedex/data/csv/version_group_pokemon_move_methods.csv b/pokedex/data/csv/version_group_pokemon_move_methods.csv
index 6754ce2..97829b9 100644
--- a/pokedex/data/csv/version_group_pokemon_move_methods.csv
+++ b/pokedex/data/csv/version_group_pokemon_move_methods.csv
@@ -76,3 +76,9 @@ version_group_id,pokemon_move_method_id
 17,4
 17,6
 17,10
+18,1
+18,2
+18,3
+18,4
+18,6
+18,10
diff --git a/pokedex/data/csv/version_group_regions.csv b/pokedex/data/csv/version_group_regions.csv
index d4b28ee..4f3d994 100644
--- a/pokedex/data/csv/version_group_regions.csv
+++ b/pokedex/data/csv/version_group_regions.csv
@@ -17,3 +17,4 @@ version_group_id,region_id
 15,6
 16,3
 17,7
+18,7