B/W: Real form names for basurao, hihidaruma, and meroetta.

diff --git a/pokedex/data/csv/pokemon.csv b/pokedex/data/csv/pokemon.csv
index 2700299..9a46052 100644 (file)
--- a/pokedex/data/csv/pokemon.csv
+++ b/pokedex/data/csv/pokemon.csv
@@ -548,12 +548,12 @@ id,name,forme_name,forme_base_pokemon_id,generation_id,evolution_chain_id,height
 547,erufuun,,,5,278,7,66,かぜかくれ,5,,,4,75,168,70,0,20,0,0
 548,churine,,,5,279,5,66,ねっこ,5,,,8,190,56,70,0,20,0,0
 549,doredia,,,5,279,11,163,はなかざり,5,,,8,75,168,70,0,20,0,0
 547,erufuun,,,5,278,7,66,かぜかくれ,5,,,4,75,168,70,0,20,0,0
 548,churine,,,5,279,5,66,ねっこ,5,,,8,190,56,70,0,20,0,0
 549,doredia,,,5,279,11,163,はなかざり,5,,,8,75,168,70,0,20,0,0

-550,basurao,normal,,5,280,10,180,らんぼう,5,,,4,25,161,70,0,40,0,0
+550,basurao,red stripe,,5,280,10,180,らんぼう,5,,,4,25,161,70,0,40,0,0

 551,meguroko,,,5,281,7,152,さばくワニ,3,,,4,180,58,70,0,20,0,0
 552,warubiru,,,5,281,10,334,さばくワニ,3,,,4,90,123,70,0,20,0,0
 553,warubiaru,,,5,281,15,963,いかく,8,,,4,45,229,70,0,20,0,0
 554,darumakka,,,5,282,6,375,だるま,8,,,4,120,63,70,0,20,0,0
 551,meguroko,,,5,281,7,152,さばくワニ,3,,,4,180,58,70,0,20,0,0
 552,warubiru,,,5,281,10,334,さばくワニ,3,,,4,90,123,70,0,20,0,0
 553,warubiaru,,,5,281,15,963,いかく,8,,,4,45,229,70,0,20,0,0
 554,darumakka,,,5,282,6,375,だるま,8,,,4,120,63,70,0,20,0,0

-555,hihidaruma,unblue,,5,282,13,929,えんじょう,8,,,4,60,168,70,0,20,0,0
+555,hihidaruma,normal,,5,282,13,929,えんじょう,8,,,4,60,168,70,0,20,0,0

 556,marakacchi,,,5,283,10,280,サボテン,5,,,4,255,161,70,0,20,0,0
 557,ishizumai,,,5,284,3,145,いしやど,8,,,4,190,65,70,0,20,0,0
 558,iwaparesu,,,5,284,14,2000,いわやど,8,,,4,75,166,70,0,20,0,0
 556,marakacchi,,,5,283,10,280,サボテン,5,,,4,255,161,70,0,20,0,0
 557,ishizumai,,,5,284,3,145,いしやど,8,,,4,190,65,70,0,20,0,0
 558,iwaparesu,,,5,284,14,2000,いわやど,8,,,4,75,166,70,0,20,0,0


@@ -646,7 +646,7 @@ id,name,forme_name,forme_base_pokemon_id,generation_id,evolution_chain_id,height
 645,randorosu,,,5,332,15,680,ほうじょう,3,,,0,3,270,90,0,120,0,0
 646,kyuremu,,,5,333,30,3250,きょうかい,4,,,-1,3,297,0,0,120,0,0
 647,kerudio,,,5,334,14,485,わかごま,10,,,-1,3,261,35,0,80,0,0
 645,randorosu,,,5,332,15,680,ほうじょう,3,,,0,3,270,90,0,120,0,0
 646,kyuremu,,,5,333,30,3250,きょうかい,4,,,-1,3,297,0,0,120,0,0
 647,kerudio,,,5,334,14,485,わかごま,10,,,-1,3,261,35,0,80,0,0

-648,meroetta,unred,,5,335,6,65,せんりつ,9,,,-1,3,270,100,0,120,0,0
+648,meroetta,voice,,5,335,6,65,せんりつ,9,,,-1,3,270,100,0,120,0,0

 649,genosekuto,,,5,336,15,825,こせいだい,7,,,-1,3,270,0,0,120,0,0
 10001,Deoxys,attack,386,3,202,17,608,DNA,8,12,5,-1,3,215,0,0,120,0,0
 10002,Deoxys,defense,386,3,202,17,608,DNA,8,12,5,-1,3,215,0,0,120,0,0
 649,genosekuto,,,5,336,15,825,こせいだい,7,,,-1,3,270,0,0,120,0,0
 10001,Deoxys,attack,386,3,202,17,608,DNA,8,12,5,-1,3,215,0,0,120,0,0
 10002,Deoxys,defense,386,3,202,17,608,DNA,8,12,5,-1,3,215,0,0,120,0,0


@@ -663,6 +663,6 @@ id,name,forme_name,forme_base_pokemon_id,generation_id,evolution_chain_id,height
 10013,Castform,sunny,351,3,179,3,8,てんき,9,1,3,4,45,147,70,0,25,0,0
 10014,Castform,rain,351,3,179,3,8,てんき,9,1,3,4,45,147,70,0,25,0,0
 10015,Castform,snow-cloud,351,3,179,3,8,てんき,9,1,3,4,45,147,70,0,25,0,0
 10013,Castform,sunny,351,3,179,3,8,てんき,9,1,3,4,45,147,70,0,25,0,0
 10014,Castform,rain,351,3,179,3,8,てんき,9,1,3,4,45,147,70,0,25,0,0
 10015,Castform,snow-cloud,351,3,179,3,8,てんき,9,1,3,4,45,147,70,0,25,0,0

-10016,basurao,alternate,550,5,280,10,180,らんぼう,5,,,4,25,161,70,0,40,0,0
-10017,hihidaruma,blue,555,5,282,13,929,えんじょう,8,,,4,60,189,70,0,20,0,0
-10018,meroetta,red,648,5,335,6,65,せんりつ,9,,,-1,3,270,100,0,120,0,0
+10016,basurao,blue stripe,550,5,280,10,180,らんぼう,5,,,4,25,161,70,0,40,0,0
+10017,hihidaruma,daruma,555,5,282,13,929,えんじょう,8,,,4,60,189,70,0,20,0,0
+10018,meroetta,step,648,5,335,6,65,せんりつ,9,,,-1,3,270,100,0,120,0,0

diff --git a/pokedex/data/csv/pokemon_form_sprites.csv b/pokedex/data/csv/pokemon_form_sprites.csv
index be004d0..f6ba9d4 100644 (file)
--- a/pokedex/data/csv/pokemon_form_sprites.csv
+++ b/pokedex/data/csv/pokemon_form_sprites.csv
@@ -77,10 +77,10 @@ id,pokemon_id,introduced_in_version_group_id,name,is_default
 76,493,8,water,0
 77,172,3,,1
 78,172,10,spiky-eared,0
 76,493,8,water,0
 77,172,3,,1
 78,172,10,spiky-eared,0

-79,550,11,normal,1
-80,550,11,alternate,0
-81,555,11,unblue,1
-82,555,11,blue,0
+79,550,11,red-stripe,1
+80,550,11,blue-stripe,0
+81,555,11,normal,1
+82,555,11,daruma,0

 83,585,11,spring,1
 84,585,11,summer,0
 85,585,11,autumn,0
 83,585,11,spring,1
 84,585,11,summer,0
 85,585,11,autumn,0


@@ -89,8 +89,8 @@ id,pokemon_id,introduced_in_version_group_id,name,is_default
 88,586,11,summer,0
 89,586,11,autumn,0
 90,586,11,winter,0
 88,586,11,summer,0
 89,586,11,autumn,0
 90,586,11,winter,0

-91,648,11,unred,1
-92,648,11,red,0
+91,648,11,voice,1
+92,648,11,step,0

 93,649,11,orange,1
 94,649,11,blue,0
 95,649,11,red,0
 93,649,11,orange,1
 94,649,11,blue,0
 95,649,11,red,0