Merge pull request #1041 from AsparagusEduardo/UnownStats

Using ability constants for OLD_UNOWN stats
This commit is contained in:
Sierra A 2020-05-18 16:33:23 -07:00 committed by GitHub
commit da30244b6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2,36 +2,36 @@
// 255 (MON_GENDERLESS) is reserved for genderless Pokémon.
#define PERCENT_FEMALE(percent) min(254, ((percent * 255) / 100))
#define OLD_UNOWN_BASE_STATS \
{ \
.baseHP = 50, \
.baseAttack = 150, \
.baseDefense = 50, \
.baseSpeed = 150, \
.baseSpAttack = 150, \
.baseSpDefense = 50, \
.type1 = TYPE_NORMAL, \
.type2 = TYPE_NORMAL, \
.catchRate = 3, \
.expYield = 1, \
.evYield_HP = 2, \
.evYield_Attack = 2, \
.evYield_Defense = 2, \
.evYield_Speed = 2, \
.evYield_SpAttack = 2, \
.evYield_SpDefense = 2, \
.item1 = ITEM_NONE, \
.item2 = ITEM_NONE, \
.genderRatio = MON_GENDERLESS, \
.eggCycles = 120, \
.friendship = 0, \
.growthRate = GROWTH_MEDIUM_FAST, \
.eggGroup1 = EGG_GROUP_UNDISCOVERED,\
.eggGroup2 = EGG_GROUP_UNDISCOVERED,\
.abilities = {0, 0}, \
.safariZoneFleeRate = 0, \
.bodyColor = BODY_COLOR_BLACK, \
.noFlip = FALSE, \
#define OLD_UNOWN_BASE_STATS \
{ \
.baseHP = 50, \
.baseAttack = 150, \
.baseDefense = 50, \
.baseSpeed = 150, \
.baseSpAttack = 150, \
.baseSpDefense = 50, \
.type1 = TYPE_NORMAL, \
.type2 = TYPE_NORMAL, \
.catchRate = 3, \
.expYield = 1, \
.evYield_HP = 2, \
.evYield_Attack = 2, \
.evYield_Defense = 2, \
.evYield_Speed = 2, \
.evYield_SpAttack = 2, \
.evYield_SpDefense = 2, \
.item1 = ITEM_NONE, \
.item2 = ITEM_NONE, \
.genderRatio = MON_GENDERLESS, \
.eggCycles = 120, \
.friendship = 0, \
.growthRate = GROWTH_MEDIUM_FAST, \
.eggGroup1 = EGG_GROUP_UNDISCOVERED, \
.eggGroup2 = EGG_GROUP_UNDISCOVERED, \
.abilities = {ABILITY_NONE, ABILITY_NONE}, \
.safariZoneFleeRate = 0, \
.bodyColor = BODY_COLOR_BLACK, \
.noFlip = FALSE, \
}
const struct BaseStats gBaseStats[] =