diff options
| author | yenatch <yenatch@gmail.com> | 2018-04-18 22:18:34 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2018-04-18 22:18:52 -0400 |
| commit | 0a040394f34d2d4e5386277649bbff450e3b3075 (patch) | |
| tree | 20794fecd9af5df292cfa1973739e54607241465 /src/battle/battle_4.c | |
| parent | e0e2f0218d5d558a375ae972ab8b5eb225784051 (diff) | |
physical/special type macros
Diffstat (limited to 'src/battle/battle_4.c')
| -rw-r--r-- | src/battle/battle_4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c index bd72e70f3..5ea6e80b3 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 < TYPE_MYSTERY && !(gHitMarker & HITMARKER_x100000) && gCurrentMove != MOVE_PAIN_SPLIT) + if (TYPE_IS_PHYSICAL(moveType) && !(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 >= TYPE_MYSTERY && !(gHitMarker & HITMARKER_x100000)) + else if (!TYPE_IS_PHYSICAL(moveType) && !(gHitMarker & HITMARKER_x100000)) { gProtectStructs[gActiveBattler].specialDmg = gHpDealt; gSpecialStatuses[gActiveBattler].moveturnLostHP_special = gHpDealt; |