ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-18 17:34:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #470 from Rangi42/master

Browse Source 
Fix OLD_UNOWN_BASE_STATS formatting
This commit is contained in:
Diegoisawesome 2018-12-23 21:10:37 -06:00 committed by GitHub
commit f835a35662
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 58 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
src/data/pokemon/base_stats.h
View File

@ -1,37 +1,39 @@
// Maximum value for a female Pokémon is 254 (MON_FEMALE) which is 100% female. // Maximum value for a female Pokémon is 254 (MON_FEMALE) which is 100% female.
// 255 (MON_GENDERLESS) is reserved for genderless Pokémon. // 255 (MON_GENDERLESS) is reserved for genderless Pokémon.
#define PERCENT_FEMALE(percent) min(254, ((percent * 255) / 100)) #define PERCENT_FEMALE(percent) min(254, ((percent * 255) / 100))
#define OLD_UNOWN_BASE_STATS { \
.baseHP = 50, \ #define OLD_UNOWN_BASE_STATS \
.baseAttack = 150, \ { \
.baseDefense = 50, \ .baseHP = 50, \
.baseSpAttack = 150, \ .baseAttack = 150, \
.baseSpDefense = 50, \ .baseDefense = 50, \
.baseSpeed = 150, \ .baseSpAttack = 150, \
.type1 = TYPE_NORMAL, \ .baseSpDefense = 50, \
.type2 = TYPE_NORMAL, \ .baseSpeed = 150, \
.catchRate = 3, \ .type1 = TYPE_NORMAL, \
.expYield = 1, \ .type2 = TYPE_NORMAL, \
.evYield_HP = 2, \ .catchRate = 3, \
.evYield_Attack = 2, \ .expYield = 1, \
.evYield_Defense = 2, \ .evYield_HP = 2, \
.evYield_Speed = 2, \ .evYield_Attack = 2, \
.evYield_SpAttack = 2, \ .evYield_Defense = 2, \
.evYield_SpDefense = 2, \ .evYield_Speed = 2, \
.item1 = ITEM_NONE, \ .evYield_SpAttack = 2, \
.item2 = ITEM_NONE, \ .evYield_SpDefense = 2, \
.genderRatio = MON_GENDERLESS, \ .item1 = ITEM_NONE, \
.eggCycles = 120, \ .item2 = ITEM_NONE, \
.friendship = 0, \ .genderRatio = MON_GENDERLESS, \
.growthRate = GROWTH_MEDIUM_FAST, \ .eggCycles = 120, \
.eggGroup1 = EGG_GROUP_UNDISCOVERED,\ .friendship = 0, \
.eggGroup2 = EGG_GROUP_UNDISCOVERED,\ .growthRate = GROWTH_MEDIUM_FAST, \
.ability1 = ABILITY_NONE, \ .eggGroup1 = EGG_GROUP_UNDISCOVERED,\
.ability2 = ABILITY_NONE, \ .eggGroup2 = EGG_GROUP_UNDISCOVERED,\
.safariZoneFleeRate = 0, \ .ability1 = ABILITY_NONE, \
.bodyColor = BODY_COLOR_BLACK, \ .ability2 = ABILITY_NONE, \
.noFlip = FALSE, \ .safariZoneFleeRate = 0, \
}, .bodyColor = BODY_COLOR_BLACK, \
.noFlip = FALSE, \
}
const struct BaseStats gBaseStats[] = const struct BaseStats gBaseStats[] =
{ {
@ -8320,55 +8322,55 @@ const struct BaseStats gBaseStats[] =
.noFlip = FALSE, .noFlip = FALSE,
}, },
[SPECIES_OLD_UNOWN_B] = OLD_UNOWN_BASE_STATS [SPECIES_OLD_UNOWN_B] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_C] = OLD_UNOWN_BASE_STATS [SPECIES_OLD_UNOWN_C] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_D] = OLD_UNOWN_BASE_STATS [SPECIES_OLD_UNOWN_D] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_E] = OLD_UNOWN_BASE_STATS [SPECIES_OLD_UNOWN_E] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_F] = OLD_UNOWN_BASE_STATS [SPECIES_OLD_UNOWN_F] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_G] = OLD_UNOWN_BASE_STATS [SPECIES_OLD_UNOWN_G] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_H] = OLD_UNOWN_BASE_STATS [SPECIES_OLD_UNOWN_H] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_I] = OLD_UNOWN_BASE_STATS [SPECIES_OLD_UNOWN_I] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_J] = OLD_UNOWN_BASE_STATS [SPECIES_OLD_UNOWN_J] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_K] = OLD_UNOWN_BASE_STATS [SPECIES_OLD_UNOWN_K] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_L] = OLD_UNOWN_BASE_STATS [SPECIES_OLD_UNOWN_L] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_M] = OLD_UNOWN_BASE_STATS [SPECIES_OLD_UNOWN_M] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_N] = OLD_UNOWN_BASE_STATS [SPECIES_OLD_UNOWN_N] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_O] = OLD_UNOWN_BASE_STATS [SPECIES_OLD_UNOWN_O] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_P] = OLD_UNOWN_BASE_STATS [SPECIES_OLD_UNOWN_P] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_Q] = OLD_UNOWN_BASE_STATS [SPECIES_OLD_UNOWN_Q] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_R] = OLD_UNOWN_BASE_STATS [SPECIES_OLD_UNOWN_R] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_S] = OLD_UNOWN_BASE_STATS [SPECIES_OLD_UNOWN_S] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_T] = OLD_UNOWN_BASE_STATS [SPECIES_OLD_UNOWN_T] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_U] = OLD_UNOWN_BASE_STATS [SPECIES_OLD_UNOWN_U] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_V] = OLD_UNOWN_BASE_STATS [SPECIES_OLD_UNOWN_V] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_W] = OLD_UNOWN_BASE_STATS [SPECIES_OLD_UNOWN_W] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_X] = OLD_UNOWN_BASE_STATS [SPECIES_OLD_UNOWN_X] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_Y] = OLD_UNOWN_BASE_STATS [SPECIES_OLD_UNOWN_Y] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_Z] = OLD_UNOWN_BASE_STATS [SPECIES_OLD_UNOWN_Z] = OLD_UNOWN_BASE_STATS,
[SPECIES_TREECKO] = [SPECIES_TREECKO] =
{ {