diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-16 09:29:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-16 09:29:23 -0400 |
| commit | d888fe10131653e48dd7ae28b2568b6c1c69f177 (patch) | |
| tree | 4cdee52eaf9608fae86e6c2009f88b36f3e63a05 /src | |
| parent | 7bea28cb842cec76ae2e3ddf10282a807e7ba988 (diff) | |
| parent | c8e1079736e9df14889189c4b47e9b4b6f784512 (diff) | |
Merge pull request #1096 from DizzyEggg/patch-2
Use stat constants in MonGainEVs
Diffstat (limited to 'src')
| -rw-r--r-- | src/pokemon.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/src/pokemon.c b/src/pokemon.c index 329240f99..3f5dde3f9 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -5836,7 +5836,7 @@ void MonGainEVs(struct Pokemon *mon, u16 defeatedSpecies) u16 totalEVs = 0; u16 heldItem; u8 holdEffect; - int i; + int i, multiplier; 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++) { - u8 hasHadPokerus; - int multiplier; - if (totalEVs >= MAX_TOTAL_EVS) break; - - hasHadPokerus = CheckPartyHasHadPokerus(mon, 0); - - if (hasHadPokerus) + + if (CheckPartyHasHadPokerus(mon, 0)) multiplier = 2; else multiplier = 1; switch (i) { - case 0: + case STAT_HP: evIncrease = gBaseStats[defeatedSpecies].evYield_HP * multiplier; break; - case 1: + case STAT_ATK: evIncrease = gBaseStats[defeatedSpecies].evYield_Attack * multiplier; break; - case 2: + case STAT_DEF: evIncrease = gBaseStats[defeatedSpecies].evYield_Defense * multiplier; break; - case 3: + case STAT_SPEED: evIncrease = gBaseStats[defeatedSpecies].evYield_Speed * multiplier; break; - case 4: + case STAT_SPATK: evIncrease = gBaseStats[defeatedSpecies].evYield_SpAttack * multiplier; break; - case 5: + case STAT_SPDEF: evIncrease = gBaseStats[defeatedSpecies].evYield_SpDefense * multiplier; break; } heldItem = GetMonData(mon, MON_DATA_HELD_ITEM, 0); - if (heldItem == ITEM_ENIGMA_BERRY) { if (gMain.inBattle) |