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

Tauros forms stat fixes + Electrode-H evo item fix (#3970)

Browse source 
* Tauros forms stat fixes + Electrode-H evo item fix

* fixes misc info placement
This commit is contained in:
Alex 2024-01-11 10:56:19 +01:00 committed by GitHub
parent a1a79ce8db
commit e0f672fbad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/data/pokemon/species_info/gen_1.h
View file

@ -7659,7 +7659,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
ICON(VoltorbHisuian, 0), ICON(VoltorbHisuian, 0),
LEARNSETS(VoltorbHisuian), LEARNSETS(VoltorbHisuian),
.isHisuianForm = TRUE, .isHisuianForm = TRUE,
.evolutions = EVOLUTION({EVO_LEVEL, ITEM_LEAF_STONE, SPECIES_ELECTRODE_HISUIAN}), .evolutions = EVOLUTION({EVO_ITEM, ITEM_LEAF_STONE, SPECIES_ELECTRODE_HISUIAN}),
}, },
[SPECIES_ELECTRODE_HISUIAN] = [SPECIES_ELECTRODE_HISUIAN] =
@ -10161,12 +10161,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
#if P_FAMILY_TAUROS #if P_FAMILY_TAUROS
#define TAUROS_MISC_INFO \ #define TAUROS_MISC_INFO \
.baseHP = 75, \
.baseAttack = 100, \
.baseDefense = 95, \
.baseSpeed = 110, \
.baseSpAttack = 40, \
.baseSpDefense = 70, \
.catchRate = 45, \ .catchRate = 45, \
.expYield = 172, \ .expYield = 172, \
.genderRatio = MON_MALE, \ .genderRatio = MON_MALE, \
@ -10189,6 +10183,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
[SPECIES_TAUROS] = [SPECIES_TAUROS] =
{ {
TAUROS_MISC_INFO, TAUROS_MISC_INFO,
.baseHP = 75,
.baseAttack = 100,
.baseDefense = 95,
.baseSpeed = 110,
.baseSpAttack = 40,
.baseSpDefense = 70,
.types = { TYPE_NORMAL, TYPE_NORMAL }, .types = { TYPE_NORMAL, TYPE_NORMAL },
.evYield_Attack = 1, .evYield_Attack = 1,
.evYield_Speed = 1, .evYield_Speed = 1,
@ -10214,9 +10214,17 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
}, },
#if P_PALDEAN_FORMS #if P_PALDEAN_FORMS
#define PALDEAN_TAUROS_BASE_STATS \
.baseHP = 75, \
.baseAttack = 110, \
.baseDefense = 105, \
.baseSpeed = 100, \
.baseSpAttack = 30, \
.baseSpDefense = 70
[SPECIES_TAUROS_PALDEAN_COMBAT_BREED] = [SPECIES_TAUROS_PALDEAN_COMBAT_BREED] =
{ {
TAUROS_MISC_INFO, TAUROS_MISC_INFO,
PALDEAN_TAUROS_BASE_STATS,
.types = { TYPE_FIGHTING, TYPE_FIGHTING }, .types = { TYPE_FIGHTING, TYPE_FIGHTING },
.evYield_Attack = 2, .evYield_Attack = 2,
.abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW }, .abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW },
@ -10243,6 +10251,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
[SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] =
{ {
TAUROS_MISC_INFO, TAUROS_MISC_INFO,
PALDEAN_TAUROS_BASE_STATS,
.types = { TYPE_FIGHTING, TYPE_FIRE }, .types = { TYPE_FIGHTING, TYPE_FIRE },
.evYield_Attack = 2, .evYield_Attack = 2,
.abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW }, .abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW },
@ -10269,6 +10278,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
[SPECIES_TAUROS_PALDEAN_AQUA_BREED] = [SPECIES_TAUROS_PALDEAN_AQUA_BREED] =
{ {
TAUROS_MISC_INFO, TAUROS_MISC_INFO,
PALDEAN_TAUROS_BASE_STATS,
.types = { TYPE_FIGHTING, TYPE_WATER }, .types = { TYPE_FIGHTING, TYPE_WATER },
.evYield_Attack = 2, .evYield_Attack = 2,
.abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW }, .abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW },