dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Prettier GetDeoxysStat

Browse Source
This commit is contained in:
DizzyEggg
2019-07-29 21:44:03 +02:00
parent ff2dcf5413
commit af55029843
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pokemon.c
+6 -11
View File
@@ -2649,25 +2649,20 @@ bool8 sub_80688F8(u8 caseId, u8 battlerId)
return TRUE; return TRUE;
} }
static s32 GetDeoxysStat(struct Pokemon *mon, s32 statId) static u16 GetDeoxysStat(struct Pokemon *mon, s32 statId)
{ {
s32 ivVal, evVal; s32 ivVal, evVal;
s32 statValue; u16 statValue = 0;
u8 nature, statId_; u8 nature;
if (gBattleTypeFlags & BATTLE_TYPE_20) if (gBattleTypeFlags & BATTLE_TYPE_20 || GetMonData(mon, MON_DATA_SPECIES, NULL) != SPECIES_DEOXYS)
return 0;
if (GetMonData(mon, MON_DATA_SPECIES, NULL) != SPECIES_DEOXYS)
return 0; return 0;
ivVal = GetMonData(mon, MON_DATA_HP_IV + statId, NULL); ivVal = GetMonData(mon, MON_DATA_HP_IV + statId, NULL);
evVal = GetMonData(mon, MON_DATA_HP_EV + statId, NULL); evVal = GetMonData(mon, MON_DATA_HP_EV + statId, NULL);
statValue = (u16)(((sDeoxysBaseStats[statId] * 2 + ivVal + evVal / 4) * mon->level) / 100 + 5); statValue = ((sDeoxysBaseStats[statId] * 2 + ivVal + evVal / 4) * mon->level) / 100 + 5;
nature = GetNature(mon); nature = GetNature(mon);
statId_ = statId; // needed to match statValue = ModifyStatByNature(nature, statValue, (u8)statId);
statValue = ModifyStatByNature(nature, statValue, statId_);
return statValue; return statValue;
} }