atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed identation for better readability.

Browse source
This commit is contained in:
Eduardo Quezada 2020-10-25 12:34:48 -03:00
parent 13a6b70e8c
commit 641daafb3f
2 changed files with 1398 additions and 1418 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/constants/pokemon_config.h
View file

@ -16,6 +16,6 @@
#define P_UPDATED_TYPES GEN_8 // In Gen6+, several Pokémon were changed to be partially or fully Fairy type.
#define P_UPDATED_STATS GEN_8 // Since Gen 6, Pokémon stats are updated with each passing generation.
#define P_UPDATED_ABILITIES GEN_8 // Since Gen 6, certain Pokémon have their abilities changed. Requires BATTLE_ENGINE for Gen4+ abilities.
#define P_UPDATED_EGG_GROUPS GEN_8 // Since Gen 6, certain Pokémon have their abilities changed. Requires BATTLE_ENGINE for Gen4+ abilities.
#define P_UPDATED_EGG_GROUPS GEN_8 // Since Gen 8, certain Pokémon have their abilities changed. Requires BATTLE_ENGINE for Gen4+ abilities.
#endif // GUARD_CONSTANTS_POKEMON_CONFIG_H

60
src/data/pokemon/base_stats.h
View file

@ -664,15 +664,13 @@ const struct BaseStats gBaseStats[] =
{
.baseHP = 35,
.baseAttack = 55,
#if P_UPDATED_STATS >= GEN_6
.baseDefense = 40,
.baseSpeed = 90,
.baseSpAttack = 50,
#if P_UPDATED_STATS >= GEN_6
.baseDefense = 40,
.baseSpDefense = 50,
#else
.baseDefense = 30,
.baseSpeed = 90,
.baseSpAttack = 50,
.baseSpDefense = 40,
#endif
.type1 = TYPE_ELECTRIC,
@ -6170,20 +6168,17 @@ const struct BaseStats gBaseStats[] =
[SPECIES_MAGCARGO] =
{
#if P_UPDATED_STATS >= GEN_7
.baseHP = 60,
.baseSpDefense = 80,
.baseAttack = 50,
.baseDefense = 120,
.baseSpeed = 30,
#if P_UPDATED_STATS >= GEN_7
.baseHP = 60,
.baseSpAttack = 90,
#else
.baseHP = 50,
.baseAttack = 50,
.baseDefense = 120,
.baseSpeed = 30,
.baseSpAttack = 80,
#endif
.baseSpDefense = 80,
.type1 = TYPE_FIRE,
.type2 = TYPE_ROCK,
.catchRate = 75,
@ -6264,19 +6259,16 @@ const struct BaseStats gBaseStats[] =
[SPECIES_CORSOLA] =
{
#if P_UPDATED_STATS >= GEN_7
.baseHP = 65,
.baseAttack = 55,
.baseDefense = 95,
.baseSpeed = 35,
.baseSpAttack = 65,
#if P_UPDATED_STATS >= GEN_7
.baseHP = 65,
.baseDefense = 95,
.baseSpDefense = 95,
#else
.baseHP = 55,
.baseAttack = 55,
.baseDefense = 85,
.baseSpeed = 35,
.baseSpAttack = 65,
.baseSpDefense = 85,
#endif
.type1 = TYPE_WATER,
@ -8828,15 +8820,13 @@ const struct BaseStats gBaseStats[] =
{
.baseHP = 65,
.baseAttack = 73,
#if P_UPDATED_STATS >= GEN_7
.baseDefense = 75,
.baseSpeed = 85,
.baseSpAttack = 47,
#if P_UPDATED_STATS >= GEN_7
.baseDefense = 75,
.baseSpDefense = 85,
#else
.baseDefense = 55,
.baseSpeed = 85,
.baseSpAttack = 47,
.baseSpDefense = 75,
#endif
.type1 = TYPE_BUG,
@ -8863,15 +8853,13 @@ const struct BaseStats gBaseStats[] =
{
.baseHP = 65,
.baseAttack = 47,
#if P_UPDATED_STATS >= GEN_7
.baseDefense = 75,
.baseSpeed = 85,
.baseSpAttack = 73,
#if P_UPDATED_STATS >= GEN_7
.baseDefense = 75,
.baseSpDefense = 85,
#else
.baseDefense = 55,
.baseSpeed = 85,
.baseSpAttack = 73,
.baseSpDefense = 75,
#endif
.type1 = TYPE_BUG,
@ -10087,19 +10075,16 @@ const struct BaseStats gBaseStats[] =
[SPECIES_CHIMECHO] =
{
#if P_UPDATED_STATS >= GEN_7
.baseHP = 75,
.baseAttack = 50,
.baseDefense = 80,
.baseSpeed = 65,
.baseSpAttack = 95,
#if P_UPDATED_STATS >= GEN_7
.baseHP = 75,
.baseDefense = 80,
.baseSpDefense = 90,
#else
.baseHP = 65,
.baseAttack = 50,
.baseDefense = 70,
.baseSpeed = 65,
.baseSpAttack = 95,
.baseSpDefense = 80,
#endif
.type1 = TYPE_PSYCHIC,
@ -17611,13 +17596,12 @@ const struct BaseStats gBaseStats[] =
[SPECIES_CRYOGONAL] =
{
.baseAttack = 50,
#if P_UPDATED_STATS >= GEN_7
.baseHP = 80,
.baseAttack = 50,
.baseDefense = 50,
#else
.baseHP = 70,
.baseAttack = 50,
.baseDefense = 30,
#endif
.baseSpeed = 105,
@ -19553,15 +19537,13 @@ const struct BaseStats gBaseStats[] =
{
.baseHP = 60,
.baseAttack = 50,
#if P_UPDATED_STATS >= GEN_8
.baseDefense = 140,
.baseSpeed = 60,
.baseSpAttack = 50,
#if P_UPDATED_STATS >= GEN_8
.baseDefense = 140,
.baseSpDefense = 140,
#else
.baseDefense = 150,
.baseSpeed = 60,
.baseSpAttack = 50,
.baseSpDefense = 150,
#endif
.type1 = TYPE_STEEL,
@ -25325,15 +25307,13 @@ const struct BaseStats gBaseStats[] =
[SPECIES_AEGISLASH_BLADE] =
{
.baseHP = 60,
#if P_UPDATED_STATS >= GEN_8
.baseAttack = 140,
.baseDefense = 50,
.baseSpeed = 60,
#if P_UPDATED_STATS >= GEN_8
.baseAttack = 140,
.baseSpAttack = 140,
#else
.baseAttack = 150,
.baseDefense = 50,
.baseSpeed = 60,
.baseSpAttack = 150,
#endif
.baseSpDefense = 50,