diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-09-22 12:18:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-22 12:18:48 -0400 |
| commit | a180d2af49250b9cf005ce1635e5e59c7e6848c4 (patch) | |
| tree | a457673d0bbfe61da83b59a08b256dadaa4b4821 /src/pokemon.c | |
| parent | 58b8d7c297576846aeef4173bbe8a6a71608ad98 (diff) | |
| parent | 9d4fc9234be10ccad76987e08512373bb097d8e0 (diff) | |
Merge branch 'master' into document-eventscripts
Diffstat (limited to 'src/pokemon.c')
| -rw-r--r-- | src/pokemon.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/pokemon.c b/src/pokemon.c index 29358b22f..8812e5bc4 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -4817,11 +4817,11 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov { if (evCount >= MAX_TOTAL_EVS) return TRUE; - if (dataSigned >= 100) + if (dataSigned >= EV_ITEM_RAISE_LIMIT) break; - if (dataSigned + r2 > 100) - r5 = 100 - (dataSigned + r2) + r2; + if (dataSigned + r2 > EV_ITEM_RAISE_LIMIT) + r5 = EV_ITEM_RAISE_LIMIT - (dataSigned + r2) + r2; else r5 = r2; @@ -5021,11 +5021,11 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov { if (evCount >= MAX_TOTAL_EVS) return TRUE; - if (dataSigned >= 100) + if (dataSigned >= EV_ITEM_RAISE_LIMIT) break; - if (dataSigned + r2 > 100) - r5 = 100 - (dataSigned + r2) + r2; + if (dataSigned + r2 > EV_ITEM_RAISE_LIMIT) + r5 = EV_ITEM_RAISE_LIMIT - (dataSigned + r2) + r2; else r5 = r2; |