Tympole and Timburr; also Basculin's forms are Stripe*d*. #451

Tympole and Timburr:
http://www.officialnintendomagazine.co.uk/article.php?id=23389

diff --git a/pokedex/data/csv/pokemon.csv b/pokedex/data/csv/pokemon.csv
index d025489..5e3ec0c 100644 (file)
--- a/pokedex/data/csv/pokemon.csv
+++ b/pokedex/data/csv/pokemon.csv
@@ -530,10 +530,10 @@ id,name,generation_id,evolution_chain_id,height,weight,species,color_id,pokemon_
 529,Drilbur,5,270,3,85,Mole,4,,,4,120,66,70,0,20,0,544
 530,Excadrill,5,270,7,404,Subterrene,4,,,4,60,178,70,0,20,0,545
 531,tabunne,5,271,11,310,ヒヤリング,6,,,4,255,390,70,0,20,0,546
 529,Drilbur,5,270,3,85,Mole,4,,,4,120,66,70,0,20,0,544
 530,Excadrill,5,270,7,404,Subterrene,4,,,4,60,178,70,0,20,0,545
 531,tabunne,5,271,11,310,ヒヤリング,6,,,4,255,390,70,0,20,0,546

-532,dokkoraa,5,272,6,125,きんこつ,4,,,2,180,61,70,0,20,0,547
+532,Timburr,5,272,6,125,きんこつ,4,,,2,180,61,70,0,20,0,547

 533,dotekkotsu,5,272,12,400,きんこつ,4,,,2,90,142,70,0,20,0,548
 534,roobushin,5,272,14,870,きんこつ,3,,,2,45,227,70,0,20,0,549
 533,dotekkotsu,5,272,12,400,きんこつ,4,,,2,90,142,70,0,20,0,548
 534,roobushin,5,272,14,870,きんこつ,3,,,2,45,227,70,0,20,0,549

-535,otamaro,5,273,5,45,おたま,2,,,4,255,59,70,0,20,0,550
+535,Tympole,5,273,5,45,おたま,2,,,4,255,59,70,0,20,0,550

 536,gamagaru,5,273,8,170,しんどう,2,,,4,120,134,70,0,20,0,551
 537,gamageroge,5,273,15,620,しんどう,2,,,4,45,225,70,0,20,0,552
 538,nageki,5,274,13,555,じゅうどう,8,,,0,45,163,70,0,20,0,553
 536,gamagaru,5,273,8,170,しんどう,2,,,4,120,134,70,0,20,0,551
 537,gamageroge,5,273,15,620,しんどう,2,,,4,45,225,70,0,20,0,552
 538,nageki,5,274,13,555,じゅうどう,8,,,0,45,163,70,0,20,0,553

diff --git a/pokedex/data/csv/pokemon_form_groups.csv b/pokedex/data/csv/pokemon_form_groups.csv
index 9e7cfbd..5ab84d5 100644 (file)
--- a/pokedex/data/csv/pokemon_form_groups.csv
+++ b/pokedex/data/csv/pokemon_form_groups.csv
@@ -12,7 +12,7 @@ pokemon_id,term,is_battle_only,description
 487,Forme,0,"Forms have different stats.  Giratina transforms into Origin Forme in the [Distortion World]{location} or while holding a [Griseous Orb]{item}.  Otherwise, it assumes its Altered Forme.  The Griseous Orb returns to the bag upon entering the Wi-Fi Club or the Union Room."
 492,Forme,0,"Forms have different stats and movepools.  Shaymin transforms into Sky Forme with the use of a [Gracidea]{item}.  It is limited to Land Forme at night, when [frozen]{mechanic}, in the storage system boxes, in the Wi-Fi Club, and in the Union Room; under these conditions, Sky Shaymin reverts to Land Forme, and the Gracidea has no effect.  The Gracidea must be used again to return to Sky Forme.  A Gracidea may be received by showing a woman in southwest [Floaroma Town]{location} or the [Goldenrod City]{location} flower shop a Shaymin met in a fateful encounter."
 493,Type,0,"Form changes along with type to match a held Plate, due to [Multitype]{ability}."
 487,Forme,0,"Forms have different stats.  Giratina transforms into Origin Forme in the [Distortion World]{location} or while holding a [Griseous Orb]{item}.  Otherwise, it assumes its Altered Forme.  The Griseous Orb returns to the bag upon entering the Wi-Fi Club or the Union Room."
 492,Forme,0,"Forms have different stats and movepools.  Shaymin transforms into Sky Forme with the use of a [Gracidea]{item}.  It is limited to Land Forme at night, when [frozen]{mechanic}, in the storage system boxes, in the Wi-Fi Club, and in the Union Room; under these conditions, Sky Shaymin reverts to Land Forme, and the Gracidea has no effect.  The Gracidea must be used again to return to Sky Forme.  A Gracidea may be received by showing a woman in southwest [Floaroma Town]{location} or the [Goldenrod City]{location} flower shop a Shaymin met in a fateful encounter."
 493,Type,0,"Form changes along with type to match a held Plate, due to [Multitype]{ability}."

-550,Form,0,"Forms have one different ability and different wild held items. Blue-Stripe Basculin are rarer in Black Version, and Red-Stripe Basculin in White Version."
+550,Form,0,"Forms have one different ability and different wild held items. Blue-Striped Basculin are rarer in Black Version, and Red-Striped Basculin in White Version."

 555,mode,0,"Forms have different stats and types.  Darmanitan changes to daruma mode below 50% HP if it has [daruma mode]{ability}, and back to normal mode above 50% HP."
 585,Form,0,"Form changes to match the season.  To switch forms, Deerling must be in the party when loading the game."
 586,form,0,"Form changes to match the season.  To switch forms, mebukijika must be in the party when loading the game."
 555,mode,0,"Forms have different stats and types.  Darmanitan changes to daruma mode below 50% HP if it has [daruma mode]{ability}, and back to normal mode above 50% HP."
 585,Form,0,"Form changes to match the season.  To switch forms, Deerling must be in the party when loading the game."
 586,form,0,"Form changes to match the season.  To switch forms, mebukijika must be in the party when loading the game."

diff --git a/pokedex/data/csv/pokemon_forms.csv b/pokedex/data/csv/pokemon_forms.csv
index 7a88aeb..d01e76e 100644 (file)
--- a/pokedex/data/csv/pokemon_forms.csv
+++ b/pokedex/data/csv/pokemon_forms.csv
@@ -548,7 +548,7 @@ id,name,form_base_pokemon_id,unique_pokemon_id,introduced_in_version_group_id,is
 547,,547,,11,1,1
 548,,548,,11,1,1
 549,,549,,11,1,1
 547,,547,,11,1,1
 548,,548,,11,1,1
 549,,549,,11,1,1

-550,Red-Stripe,550,550,11,1,1
+550,Red-Striped,550,550,11,1,1

 551,,551,,11,1,1
 552,,552,,11,1,1
 553,,553,,11,1,1
 551,,551,,11,1,1
 552,,552,,11,1,1
 553,,553,,11,1,1


@@ -713,7 +713,7 @@ id,name,form_base_pokemon_id,unique_pokemon_id,introduced_in_version_group_id,is
 10063,Origin,487,10007,9,0,2
 10064,Sky,492,10006,9,0,2
 10065,Spiky-eared,172,,10,0,2
 10063,Origin,487,10007,9,0,2
 10064,Sky,492,10006,9,0,2
 10065,Spiky-eared,172,,10,0,2

-10066,Blue-Stripe,550,10016,11,0,2
+10066,Blue-Striped,550,10016,11,0,2

 10067,daruma,555,10017,11,0,2
 10068,Summer,585,,11,0,2
 10069,Autumn,585,,11,0,3
 10067,daruma,555,10017,11,0,2
 10068,Summer,585,,11,0,2
 10069,Autumn,585,,11,0,3