Merge branch 'master' into secret_base

This commit is contained in:
PikalaxALT
2017-11-01 23:37:57 -04:00
95 changed files with 20014 additions and 61090 deletions

View File

@@ -704,7 +704,7 @@ u8 sub_80E98AC(struct Pokemon *pokemon)
evTotal = GetMonData(pokemon, MON_DATA_HP_EV);
evTotal += GetMonData(pokemon, MON_DATA_ATK_EV);
evTotal += GetMonData(pokemon, MON_DATA_DEF_EV);
evTotal += GetMonData(pokemon, MON_DATA_SPD_EV);
evTotal += GetMonData(pokemon, MON_DATA_SPEED_EV);
evTotal += GetMonData(pokemon, MON_DATA_SPATK_EV);
evTotal += GetMonData(pokemon, MON_DATA_SPDEF_EV);
return evTotal / 6;