Commits

David Stone committed 13dbd5a

Updated Generation 5 Pokemon to conform to my new naming standards.

Comments (0)

Files changed (7)

settings/Generation 4/OU/lead.txt

 Whimsicott	0
 Petilil	0
 Lilligant	0
-Basculin-R	0
-Basculin-B	0
+Basculin-Red	0
+Basculin-Blue	0
 Sandile	0
 Krokorok	0
 Krookodile	0
 Cobalion	0
 Terrakion	0
 Virizion	0
-Tornadus-I	0
-Tornadus-T	0
-Thundurus-I	0
-Thundurus-T	0
+Tornadus-Incarnate	0
+Tornadus-Therian	0
+Thundurus-Incarnate	0
+Thundurus-Therian	0
 Reshiram	0
 Zekrom	0
-Landorus-I	0
-Landorus-T	0
+Landorus-Incarnate	0
+Landorus-Therian	0
 Kyurem	0
-Kyurem-B	0
-Kyurem-W	0
+Kyurem-Black	0
+Kyurem-White	0
 Keldeo	0
 Meloetta	0
 Genesect	0

settings/Generation 4/OU/usage.txt

 Whimsicott	0
 Petilil	0
 Lilligant	0
-Basculin-R	0
-Basculin-B	0
+Basculin-Red	0
+Basculin-Blue	0
 Sandile	0
 Krokorok	0
 Krookodile	0
 Cobalion	0
 Terrakion	0
 Virizion	0
-Tornadus-I	0
-Tornadus-T	0
-Thundurus-I	0
-Thundurus-T	0
+Tornadus-Incarnate	0
+Tornadus-Therian	0
+Thundurus-Incarnate	0
+Thundurus-Therian	0
 Reshiram	0
 Zekrom	0
-Landorus-I	0
-Landorus-T	0
+Landorus-Incarnate	0
+Landorus-Therian	0
 Kyurem	0
-Kyurem-B	0
-Kyurem-W	0
+Kyurem-Black	0
+Kyurem-White	0
 Keldeo	0
 Meloetta	0
 Genesect	0

source/pokemon/pokemon.cpp

 		120,		// Cobalion
 		120,		// Terrakion
 		100,		// Virizion
-		80,		// Tornadus-I
-		80,		// Tornadus-T
-		80,		// Thundurus-I
-		80,		// Thundurus-T
+		80,		// Tornadus-Incarnate
+		80,		// Tornadus-Therian
+		80,		// Thundurus-Incarnate
+		80,		// Thundurus-Therian
 		120,		// Reshiram
 		120,		// Zekrom
-		80,		// Landorus-I
-		80,		// Landorus-T
+		80,		// Landorus-Incarnate
+		80,		// Landorus-Therian
 		120,		// Kyurem
-		120,		// Kyurem-B
-		120,		// Kyurem-W
+		120,		// Kyurem-Black
+		120,		// Kyurem-White
 		60,		// Keldeo
 		20,		// Meloetta
 		80,		// Genesect 

source/pokemon/species.hpp

 	Whimsicott,
 	Petilil,
 	Lilligant,
-	Basculin_R,
-	Basculin_B,
+	Basculin_Red,
+	Basculin_Blue,
 	Sandile,
 	Krokorok,
 	Krookodile,
 	Cobalion,
 	Terrakion,
 	Virizion,
-	Tornadus_I,
-	Tornadus_T,
-	Thundurus_I,
-	Thundurus_T,
+	Tornadus_Incarnate,
+	Tornadus_Therian,
+	Thundurus_Incarnate,
+	Thundurus_Therian,
 	Reshiram,
 	Zekrom,
-	Landorus_I,
-	Landorus_T,
+	Landorus_Incarnate,
+	Landorus_Therian,
 	Kyurem,
-	Kyurem_B,
-	Kyurem_W,
+	Kyurem_Black,
+	Kyurem_White,
 	Keldeo,
 	Meloetta,
 	Genesect,

source/stat/stat.cpp

 		{	60,	67,	85,	77,	75,	116	},		// Whimsicott
 		{	45,	35,	50,	70,	50,	30	},		// Petilil
 		{	70,	60,	75,	110,	75,	90	},		// Lilligant
-		{	70,	92,	65,	80,	55,	98	},		// Basculin-R
-		{	70,	92,	65,	80,	55,	98	},		// Basculin-B
+		{	70,	92,	65,	80,	55,	98	},		// Basculin-Red
+		{	70,	92,	65,	80,	55,	98	},		// Basculin-Blue
 		{	50,	72,	35,	35,	35,	65	},		// Sandile
 		{	60,	82,	45,	45,	45,	74	},		// Krokorok
 		{	95,	117,	70,	65,	70,	92	},		// Krookodile
 		{	91,	90,	129,	90,	72,	108	},		// Cobalion
 		{	91,	129,	90,	72,	90,	108	},		// Terrakion
 		{	91,	90,	72,	90,	129,	108	},		// Virizion
-		{	79,	115,	70,	125,	80,	111	},		// Tornadus-I
-		{	79,	100,	80,	110,	90,	121	},		// Tornadus-T
-		{	79,	115,	70,	125,	80,	111	},		// Thundurus-I
-		{	79,	105,	70,	145,	80,	101	},		// Thundurus-T
+		{	79,	115,	70,	125,	80,	111	},		// Tornadus-Incarnate
+		{	79,	100,	80,	110,	90,	121	},		// Tornadus-Therian
+		{	79,	115,	70,	125,	80,	111	},		// Thundurus-Incarnate
+		{	79,	105,	70,	145,	80,	101	},		// Thundurus-Therian
 		{	100,	120,	100,	150,	120,	90	},		// Reshiram
 		{	100,	150,	120,	120,	100,	90	},		// Zekrom
-		{	89,	125,	90,	115,	80,	101	},		// Landorus-I
-		{	89,	145,	90,	105,	80,	91	},		// Landorus-T
+		{	89,	125,	90,	115,	80,	101	},		// Landorus-Incarnate
+		{	89,	145,	90,	105,	80,	91	},		// Landorus-Therian
 		{	125,	130,	90,	130,	90,	95	},		// Kyurem
-		{	125,	170,	100,	120,	90,	95	},		// Kyurem-B
-		{	125,	120,	90,	170,	100,	95	},		// Kyurem-W
+		{	125,	170,	100,	120,	90,	95	},		// Kyurem-Black
+		{	125,	120,	90,	170,	100,	95	},		// Kyurem-White
 		{	91,	72,	90,	129,	90,	108	},		// Keldeo
 		{	100,	77,	77,	128,	128,	90	},		// Meloetta
 	//	{	100,	128,	90,	77,	77,	128	},		// Meloetta (Pirouette form)

source/string_conversions/pokemon.cpp

 		"Conkeldurr", "Tympole", "Palpitoad", "Seismitoad", "Throh",
 		"Sawk", "Sewaddle", "Swadloon", "Leavanny", "Venipede",
 		"Whirlipede", "Scolipede", "Cottonee", "Whimsicott", "Petilil",
-		"Lilligant", "Basculin-R", "Basculin-B", "Sandile", "Krokorok",
+		"Lilligant", "Basculin-Red", "Basculin-Blue", "Sandile", "Krokorok",
 		"Krookodile", "Darumaka", "Darmanitan", "Maractus", "Dwebble",
 		"Crustle", "Scraggy", "Scrafty", "Sigilyph", "Yamask",
 		"Cofagrigus", "Tirtouga", "Carracosta", "Archen", "Archeops",
 		"Golurk", "Pawniard", "Bisharp", "Bouffalant", "Rufflet",
 		"Braviary", "Vullaby", "Mandibuzz", "Heatmor", "Durant",
 		"Deino", "Zweilous", "Hydreigon", "Larvesta", "Volcarona",
-		"Cobalion", "Terrakion", "Virizion", "Tornadus-I", "Tornadus-T",
-		"Thundurus-I", "Thundurus-T", "Reshiram", "Zekrom", "Landorus-I",
-		"Landorus-T", "Kyurem", "Kyurem-B", "Kyurem-W", "Keldeo",
+		"Cobalion", "Terrakion", "Virizion", "Tornadus-Incarnate", "Tornadus-Therian",
+		"Thundurus-Incarnate", "Thundurus-Therian", "Reshiram", "Zekrom", "Landorus-Incarnate",
+		"Landorus-Therian", "Kyurem", "Kyurem-Black", "Kyurem-White", "Keldeo",
 		"Meloetta", "Genesect",
 		
 		"END"
 		{ "whimsicott", Species::Whimsicott },
 		{ "petilil", Species::Petilil },
 		{ "lilligant", Species::Lilligant },
-		{ "basculin-r", Species::Basculin_R },
-		{ "basculin-red", Species::Basculin_R },
-		{ "basculin-b", Species::Basculin_B },
-		{ "basculin-blue", Species::Basculin_B },
-		{ "basculin", Species::Basculin_B },	// assume blue?
+		{ "basculin-red", Species::Basculin_Red },
+		{ "basculin-blue", Species::Basculin_Blue },
 		{ "sandile", Species::Sandile },
 		{ "krokorok", Species::Krokorok },
 		{ "krookodile", Species::Krookodile },
 		{ "cobalion", Species::Cobalion },
 		{ "terrakion", Species::Terrakion },
 		{ "virizion", Species::Virizion },
-		{ "tornadus-i", Species::Tornadus_I },
-		{ "tornadus-incarnate", Species::Tornadus_I },
-		{ "tornadus-t", Species::Tornadus_T },
-		{ "tornadus-therian", Species::Tornadus_T },
-		{ "thundurus-i", Species::Thundurus_I },
-		{ "thundurus-incarnate", Species::Thundurus_I },
-		{ "thundurus-t", Species::Thundurus_T },
-		{ "thundurus-therian", Species::Thundurus_T },
+		{ "tornadus-incarnate", Species::Tornadus_Incarnate },
+		{ "tornadus-therian", Species::Tornadus_Therian },
+		{ "thundurus-incarnate", Species::Thundurus_Incarnate },
+		{ "thundurus-therian", Species::Thundurus_Therian },
 		{ "reshiram", Species::Reshiram },
 		{ "zekrom", Species::Zekrom },
-		{ "landorus-i", Species::Landorus_I },
-		{ "landorus-incarnate", Species::Landorus_I },
-		{ "landorus-t", Species::Landorus_T },
-		{ "landorus-therian", Species::Landorus_T },
+		{ "landorus-incarnate", Species::Landorus_Incarnate },
+		{ "landorus-therian", Species::Landorus_Therian },
 		{ "kyurem", Species::Kyurem },
-		{ "kyurem-b", Species::Kyurem_B },
-		{ "kyurem-b", Species::Kyurem_B },
-		{ "kyurem-w", Species::Kyurem_W },
-		{ "kyurem-w", Species::Kyurem_W },
+		{ "kyurem-black", Species::Kyurem_Black },
+		{ "kyurem-white", Species::Kyurem_White },
 		{ "keldeo", Species::Keldeo },
 		{ "meloetta", Species::Meloetta },
 		{ "genesect", Species::Genesect }

source/type/collection.cpp

 		{ Type::Grass },			// Whimsicott
 		{ Type::Grass },			// Petilil
 		{ Type::Grass },			// Lilligant
-		{ Type::Water },			// Basculin-R
-		{ Type::Water },			// Basculin-B
+		{ Type::Water },			// Basculin-Red
+		{ Type::Water },			// Basculin-Blue
 		{ Type::Ground, Type::Dark },			// Sandile
 		{ Type::Ground, Type::Dark },			// Krokorok
 		{ Type::Ground, Type::Dark },			// Krookodile
 		{ Type::Steel, Type::Fighting },			// Cobalion
 		{ Type::Rock, Type::Fighting },			// Terrakion
 		{ Type::Grass, Type::Fighting },			// Virizion
-		{ Type::Flying },			// Tornadus-I
-		{ Type::Flying },			// Tornadus-T
-		{ Type::Electric, Type::Flying },			// Thundurus-I
-		{ Type::Electric, Type::Flying },			// Thundurus-T
+		{ Type::Flying },			// Tornadus-Incarnate
+		{ Type::Flying },			// Tornadus-Therian
+		{ Type::Electric, Type::Flying },			// Thundurus-Incarnate
+		{ Type::Electric, Type::Flying },			// Thundurus-Therian
 		{ Type::Dragon, Type::Fire },			// Reshiram
 		{ Type::Dragon, Type::Electric },			// Zekrom
-		{ Type::Ground, Type::Flying },			// Landorus-I
-		{ Type::Ground, Type::Flying },			// Landorus-T
+		{ Type::Ground, Type::Flying },			// Landorus-Incarnate
+		{ Type::Ground, Type::Flying },			// Landorus-Therian
 		{ Type::Dragon, Type::Ice },			// Kyurem
-		{ Type::Dragon, Type::Ice },			// Kyurem-B
-		{ Type::Dragon, Type::Ice },			// Kyurem-W
+		{ Type::Dragon, Type::Ice },			// Kyurem-Black
+		{ Type::Dragon, Type::Ice },			// Kyurem-White
 		{ Type::Water, Type::Fighting },			// Keldeo
 		{ Type::Normal, Type::Psychic },			// Meloetta
 	//	{ Type::Normal, Type::Fighting },			// Meloetta (Pirouette form)