diff options
| author | yenatch <yenatch@gmail.com> | 2018-04-18 21:45:59 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2018-04-18 21:45:59 -0400 |
| commit | 460fcf567ee43ccacb56da7b9fbbac58d4352008 (patch) | |
| tree | 7dfdee65a5efcbfec003c15df06ddbc560f5a0d4 | |
| parent | f6ed2ff9c31d7912e2dc259ddc10e17f0ecbbd1f (diff) | |
use TYPE_MYSTERY for physical/special checks
| -rw-r--r-- | src/battle/battle_4.c | 4 | ||||
| -rw-r--r-- | src/battle/calculate_base_damage.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c index 9181ce8a6..4a7c3e867 100644 --- a/src/battle/battle_4.c +++ b/src/battle/battle_4.c @@ -2087,7 +2087,7 @@ static void atk0C_datahpupdate(void) if (!gSpecialStatuses[gActiveBattler].moveturnLostHP && !(gHitMarker & HITMARKER_x100000)) gSpecialStatuses[gActiveBattler].moveturnLostHP = gHpDealt; - if (moveType <= 8 && !(gHitMarker & HITMARKER_x100000) && gCurrentMove != MOVE_PAIN_SPLIT) + if (moveType < TYPE_MYSTERY && !(gHitMarker & HITMARKER_x100000) && gCurrentMove != MOVE_PAIN_SPLIT) { gProtectStructs[gActiveBattler].physicalDmg = gHpDealt; gSpecialStatuses[gActiveBattler].moveturnLostHP_physical = gHpDealt; @@ -2102,7 +2102,7 @@ static void atk0C_datahpupdate(void) gSpecialStatuses[gActiveBattler].moveturnPhysicalBank = gBankTarget; } } - else if (moveType > 8 && !(gHitMarker & HITMARKER_x100000)) + else if (moveType >= TYPE_MYSTERY && !(gHitMarker & HITMARKER_x100000)) { gProtectStructs[gActiveBattler].specialDmg = gHpDealt; gSpecialStatuses[gActiveBattler].moveturnLostHP_special = gHpDealt; diff --git a/src/battle/calculate_base_damage.c b/src/battle/calculate_base_damage.c index 5e63ee92c..8dc4108d9 100644 --- a/src/battle/calculate_base_damage.c +++ b/src/battle/calculate_base_damage.c @@ -170,7 +170,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if (attackerHoldEffect == gHoldEffectToType[i][0] && type == gHoldEffectToType[i][1]) { - if (type <= 8) + if (type < TYPE_MYSTERY) attack = (attack * (attackerHoldEffectParam + 100)) / 100; else spAttack = (spAttack * (attackerHoldEffectParam + 100)) / 100; |