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

Expanded Paldean Tauros macro (#3971)

Browse source 
* Expanded Paldean Tauros macro

* Updated colors to December 2023 HOME changes

---------

Co-authored-by: Biffalo XIII <--global>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
This commit is contained in:
Eduardo Quezada D'Ottone 2024-01-11 13:54:19 -03:00 committed by GitHub
parent a8a504ef25
commit 4acaa0cab8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10214,21 +10214,26 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
},
#if P_PALDEAN_FORMS
#define PALDEAN_TAUROS_BASE_STATS \
.baseHP = 75, \
.baseAttack = 110, \
.baseDefense = 105, \
.baseSpeed = 100, \
.baseSpAttack = 30, \
.baseSpDefense = 70
#define TAUROS_PALDEAN_MISC_INFO \
.baseHP = 75, \
.baseAttack = 110, \
.baseDefense = 105, \
.baseSpeed = 100, \
.baseSpAttack = 30, \
.baseSpDefense = 70, \
.evYield_Attack = 2, \
.abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW }, \
.bodyColor = BODY_COLOR_BLACK, \
.frontAnimFrames = sAnims_TaurosPaldean, \
/*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ \
.backAnimId = BACK_ANIM_V_SHAKE_LOW, \
.isPaldeanForm = TRUE
[SPECIES_TAUROS_PALDEAN_COMBAT_BREED] =
{
TAUROS_MISC_INFO,
PALDEAN_TAUROS_BASE_STATS,
TAUROS_PALDEAN_MISC_INFO,
.types = { TYPE_FIGHTING, TYPE_FIGHTING },
.evYield_Attack = 2,
.abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW },
.bodyColor = BODY_COLOR_BROWN,
.weight = 1150,
.description = COMPOUND_STRING(
"This Pokémon has a muscular body\n"
@ -10237,25 +10242,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
"the opponent’s weak spots."),
FRONT_PIC(TaurosPaldeanCombatBreed, 64, 64),
.frontPicYOffset = 5,
.frontAnimFrames = sAnims_TaurosPaldean,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
BACK_PIC(TaurosPaldeanCombatBreed, 64, 48),
.backPicYOffset = 9,
.backAnimId = BACK_ANIM_V_SHAKE_LOW,
PALETTES(TaurosPaldeanCombatBreed),
ICON(TaurosPaldeanCombatBreed, 0),
LEARNSETS(TaurosPaldeanCombatBreed),
.isPaldeanForm = TRUE,
},
[SPECIES_TAUROS_PALDEAN_BLAZE_BREED] =
{
TAUROS_MISC_INFO,
PALDEAN_TAUROS_BASE_STATS,
TAUROS_PALDEAN_MISC_INFO,
.types = { TYPE_FIGHTING, TYPE_FIRE },
.evYield_Attack = 2,
.abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW },
.bodyColor = BODY_COLOR_BROWN,
.weight = 850,
.description = COMPOUND_STRING(
"When heated by fire energy, its horns can\n"
@ -10264,25 +10262,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
"both wounds and burns."),
FRONT_PIC(TaurosPaldeanBlazeBreed, 64, 64),
.frontPicYOffset = 5,
.frontAnimFrames = sAnims_TaurosPaldean,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
BACK_PIC(TaurosPaldeanBlazeBreed, 64, 48),
.backPicYOffset = 9,
.backAnimId = BACK_ANIM_V_SHAKE_LOW,
PALETTES(TaurosPaldeanBlazeBreed),
ICON(TaurosPaldeanBlazeBreed, 0),
LEARNSETS(TaurosPaldeanBlazeBreed),
.isPaldeanForm = TRUE,
},
[SPECIES_TAUROS_PALDEAN_AQUA_BREED] =
{
TAUROS_MISC_INFO,
PALDEAN_TAUROS_BASE_STATS,
TAUROS_PALDEAN_MISC_INFO,
.types = { TYPE_FIGHTING, TYPE_WATER },
.evYield_Attack = 2,
.abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW },
.bodyColor = BODY_COLOR_BROWN,
.weight = 1100,
.description = COMPOUND_STRING(
"This Pokémon blasts water from holes on\n"
@ -10291,15 +10282,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
"Tauros’s enemies."),
FRONT_PIC(TaurosPaldeanAquaBreed, 64, 64),
.frontPicYOffset = 5,
.frontAnimFrames = sAnims_TaurosPaldean,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
BACK_PIC(TaurosPaldeanAquaBreed, 64, 48),
.backPicYOffset = 9,
.backAnimId = BACK_ANIM_V_SHAKE_LOW,
PALETTES(TaurosPaldeanAquaBreed),
ICON(TaurosPaldeanAquaBreed, 0),
LEARNSETS(TaurosPaldeanAquaBreed),
.isPaldeanForm = TRUE,
},
#endif //P_PALDEAN_FORMS
#endif //P_FAMILY_TAUROS

2
src/data/pokemon/species_info/gen_8.h
View file

@ -3324,7 +3324,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
#if P_GIGANTAMAX_FORMS
[SPECIES_ALCREMIE_GIGANTAMAX] =
{
ALCREMIE_MISC_INFO(BODY_COLOR_PINK),
ALCREMIE_MISC_INFO(BODY_COLOR_YELLOW),
.isGigantamax = TRUE,
.speciesName = _("Alcremie"),
.cryId = CRY_ALCREMIE,

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

@ -1622,7 +1622,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_HUMAN_LIKE, EGG_GROUP_HUMAN_LIKE },
.abilities = { ABILITY_FLASH_FIRE, ABILITY_NONE, ABILITY_WEAK_ARMOR },
.bodyColor = BODY_COLOR_BLUE,
.bodyColor = BODY_COLOR_PURPLE,
.speciesName = _("Ceruledge"),
.cryId = CRY_CERULEDGE,
.natDexNum = NATIONAL_DEX_CERULEDGE,
@ -3670,7 +3670,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
[SPECIES_TATSUGIRI_CURLY] =
{
TATSUGIRI_MISC_INFO,
.bodyColor = BODY_COLOR_PINK,
.bodyColor = BODY_COLOR_RED,
.cryId = CRY_TATSUGIRI_CURLY,
.description = COMPOUND_STRING(
"This is a small dragon Pokémon. It\n"
@ -3686,7 +3686,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
[SPECIES_TATSUGIRI_DROOPY] =
{
TATSUGIRI_MISC_INFO,
.bodyColor = BODY_COLOR_RED,
.bodyColor = BODY_COLOR_PINK,
.cryId = CRY_TATSUGIRI_DROOPY,
.description = COMPOUND_STRING(
"This Pokémon tricks its opponents\n"
@ -3833,7 +3833,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = { ABILITY_PROTOSYNTHESIS, ABILITY_NONE },
.bodyColor = BODY_COLOR_GRAY,
.bodyColor = BODY_COLOR_WHITE,
.isParadoxForm = TRUE,
.speciesName = _("BruteBonet"),
.cryId = CRY_BRUTE_BONNET,
@ -3936,7 +3936,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = { ABILITY_PROTOSYNTHESIS, ABILITY_NONE },
.bodyColor = BODY_COLOR_RED,
.bodyColor = BODY_COLOR_WHITE,
.isParadoxForm = TRUE,
.speciesName = _("SlithrWing"),
.cryId = CRY_SLITHER_WING,
@ -4236,7 +4236,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = { ABILITY_QUARK_DRIVE, ABILITY_NONE },
.bodyColor = BODY_COLOR_YELLOW,
.bodyColor = BODY_COLOR_WHITE,
.isParadoxForm = TRUE,
.speciesName = _("Iron Moth"),
.cryId = CRY_IRON_MOTH,
@ -4385,7 +4385,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_DRAGON, EGG_GROUP_MINERAL },
.abilities = { ABILITY_THERMAL_EXCHANGE, ABILITY_NONE, ABILITY_ICE_BODY },
.bodyColor = BODY_COLOR_GRAY,
.bodyColor = BODY_COLOR_BLUE,
.speciesName = _("Arctibax"),
.cryId = CRY_ARCTIBAX,
.natDexNum = NATIONAL_DEX_ARCTIBAX,
@ -4433,7 +4433,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_DRAGON, EGG_GROUP_MINERAL },
.abilities = { ABILITY_THERMAL_EXCHANGE, ABILITY_NONE, ABILITY_ICE_BODY },
.bodyColor = BODY_COLOR_GRAY,
.bodyColor = BODY_COLOR_BLUE,
.speciesName = _("Baxcalibur"),
.cryId = CRY_BAXCALIBUR,
.natDexNum = NATIONAL_DEX_BAXCALIBUR,
@ -4495,7 +4495,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.baseSpAttack = 75,
.baseSpDefense = 70,
.abilities = { ABILITY_RATTLED, ABILITY_NONE },
.bodyColor = BODY_COLOR_BROWN,
.bodyColor = BODY_COLOR_RED,
.categoryName = _("Coin Chest"),
.height = 3,
.weight = 50,
@ -4526,7 +4526,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.baseSpAttack = 75,
.baseSpDefense = 45,
.abilities = { ABILITY_RUN_AWAY, ABILITY_NONE },
.bodyColor = BODY_COLOR_BLUE,
.bodyColor = BODY_COLOR_GRAY,
.categoryName = _("Coin Hunter"),
.height = 1,
.weight = 1,
@ -4815,7 +4815,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = { ABILITY_PROTOSYNTHESIS, ABILITY_NONE },
.bodyColor = BODY_COLOR_GREEN,
.bodyColor = BODY_COLOR_BLUE,
.isParadoxForm = TRUE,
.speciesName = _("RoarngMoon"),
.cryId = CRY_ROARING_MOON,
@ -4966,7 +4966,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
.abilities = { ABILITY_HADRON_ENGINE, ABILITY_NONE, ABILITY_NONE },
.bodyColor = BODY_COLOR_BLUE,
.bodyColor = BODY_COLOR_PURPLE,
.isLegendary = TRUE,
.isParadoxForm = TRUE,
.speciesName = _("Miraidon"),