diff options
| author | Sierra A <6080951+Sierraffinity@users.noreply.github.com> | 2020-05-18 16:33:23 -0700 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-18 16:33:23 -0700 | 
| commit | da30244b6c6d0a3ff91838b2d6a53d0bc7d9c765 (patch) | |
| tree | f11107fabe4e5e456fdf154c8535ac7e329ae43a /src/data | |
| parent | ab6bbd7ef042c5d9857a7d340d226434339651d2 (diff) | |
| parent | 179d84dcd730d3773c93b8501f49a149115e12c6 (diff) | |
Merge pull request #1041 from AsparagusEduardo/UnownStats
Using ability constants for OLD_UNOWN stats
Diffstat (limited to 'src/data')
| -rw-r--r-- | src/data/pokemon/base_stats.h | 60 | 
1 files changed, 30 insertions, 30 deletions
| diff --git a/src/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h index 4dedcfdc0..d851dfbe1 100644 --- a/src/data/pokemon/base_stats.h +++ b/src/data/pokemon/base_stats.h @@ -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[] = | 
