Use stat constants in MonGainEVs

This commit is contained in:
DizzyEggg
2020-07-16 09:58:16 +02:00
committed by GitHub
parent 7bea28cb84
commit c8e1079736
+9 -15
View File
@@ -5836,7 +5836,7 @@ void MonGainEVs(struct Pokemon *mon, u16 defeatedSpecies)
u16 totalEVs = 0; u16 totalEVs = 0;
u16 heldItem; u16 heldItem;
u8 holdEffect; u8 holdEffect;
int i; int i, multiplier;
for (i = 0; i < NUM_STATS; i++) for (i = 0; i < NUM_STATS; i++)
{ {
@@ -5846,43 +5846,37 @@ void MonGainEVs(struct Pokemon *mon, u16 defeatedSpecies)
for (i = 0; i < NUM_STATS; i++) for (i = 0; i < NUM_STATS; i++)
{ {
u8 hasHadPokerus;
int multiplier;
if (totalEVs >= MAX_TOTAL_EVS) if (totalEVs >= MAX_TOTAL_EVS)
break; break;
hasHadPokerus = CheckPartyHasHadPokerus(mon, 0); if (CheckPartyHasHadPokerus(mon, 0))
if (hasHadPokerus)
multiplier = 2; multiplier = 2;
else else
multiplier = 1; multiplier = 1;
switch (i) switch (i)
{ {
case 0: case STAT_HP:
evIncrease = gBaseStats[defeatedSpecies].evYield_HP * multiplier; evIncrease = gBaseStats[defeatedSpecies].evYield_HP * multiplier;
break; break;
case 1: case STAT_ATK:
evIncrease = gBaseStats[defeatedSpecies].evYield_Attack * multiplier; evIncrease = gBaseStats[defeatedSpecies].evYield_Attack * multiplier;
break; break;
case 2: case STAT_DEF:
evIncrease = gBaseStats[defeatedSpecies].evYield_Defense * multiplier; evIncrease = gBaseStats[defeatedSpecies].evYield_Defense * multiplier;
break; break;
case 3: case STAT_SPEED:
evIncrease = gBaseStats[defeatedSpecies].evYield_Speed * multiplier; evIncrease = gBaseStats[defeatedSpecies].evYield_Speed * multiplier;
break; break;
case 4: case STAT_SPATK:
evIncrease = gBaseStats[defeatedSpecies].evYield_SpAttack * multiplier; evIncrease = gBaseStats[defeatedSpecies].evYield_SpAttack * multiplier;
break; break;
case 5: case STAT_SPDEF:
evIncrease = gBaseStats[defeatedSpecies].evYield_SpDefense * multiplier; evIncrease = gBaseStats[defeatedSpecies].evYield_SpDefense * multiplier;
break; break;
} }
heldItem = GetMonData(mon, MON_DATA_HELD_ITEM, 0); heldItem = GetMonData(mon, MON_DATA_HELD_ITEM, 0);
if (heldItem == ITEM_ENIGMA_BERRY) if (heldItem == ITEM_ENIGMA_BERRY)
{ {
if (gMain.inBattle) if (gMain.inBattle)