diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-16 22:00:27 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-16 22:00:27 +0200 |
| commit | 118fa3afcee68deb3eeb2bc876a9afd02a45677c (patch) | |
| tree | 68390ab7335854c9c0721192ec4b8d563d0a48fe /src/pokemon.c | |
| parent | bf0178238a179b298f465b64a4f23ff43db48fc9 (diff) | |
IS_MOVE_PHYSICAL to IS_TYPE_PHYSIAL
Diffstat (limited to 'src/pokemon.c')
| -rw-r--r-- | src/pokemon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pokemon.c b/src/pokemon.c index bb2959eda..c572ee10e 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2265,7 +2265,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if (attackerHoldEffect == sHoldEffectToType[i][0] && type == sHoldEffectToType[i][1]) { - if (IS_MOVE_PHYSICAL(type)) + if (IS_TYPE_PHYSICAL(type)) attack = (attack * (attackerHoldEffectParam + 100)) / 100; else spAttack = (spAttack * (attackerHoldEffectParam + 100)) / 100; @@ -2316,7 +2316,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if (gBattleMoves[gCurrentMove].effect == EFFECT_EXPLOSION) defense /= 2; - if (IS_MOVE_PHYSICAL(type) && type != TYPE_MYSTERY) + if (IS_TYPE_PHYSICAL(type)) { if (gCritMultiplier == 2) { @@ -2366,7 +2366,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if (type == TYPE_MYSTERY) damage = 0; // is ??? type. does 0 damage. - if (IS_MOVE_SPECIAL(type)) + if (IS_TYPE_SPECIAL(type)) { if (gCritMultiplier == 2) { |