diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-09-17 15:24:44 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-09-22 08:14:22 -0500 |
| commit | 80f58f7b24058db4f6e6ab62b24875d0b78b084a (patch) | |
| tree | 1fc766d5c56ac4b56d8319289bf03d4f33a84f67 /src/pokemon.c | |
| parent | 459fca289caa2be09864412c82a868862978f082 (diff) | |
Document PLAYER_HAS constants, consolidate poke constants
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; |