Rename passive damage hitmarker (#2174)
This commit is contained in:
5 files changed
+22
-22
No files matched your search
+2
-2
@@ -3975,7 +3975,7 @@ void BattleTurnPassed(void)
|
||||
gHitMarker &= ~HITMARKER_NO_ATTACKSTRING;
|
||||
gHitMarker &= ~HITMARKER_UNABLE_TO_USE_MOVE;
|
||||
gHitMarker &= ~HITMARKER_PLAYER_FAINTED;
|
||||
gHitMarker &= ~HITMARKER_PASSIVE_DAMAGE;
|
||||
gHitMarker &= ~HITMARKER_PASSIVE_HP_UPDATE;
|
||||
gBattleScripting.animTurn = 0;
|
||||
gBattleScripting.animTargetsHit = 0;
|
||||
gBattleScripting.moveendState = 0;
|
||||
@@ -4944,7 +4944,7 @@ static void RunTurnActionsFunctions(void)
|
||||
|
||||
if (gCurrentTurnActionNumber >= gBattlersCount) // everyone did their actions, turn finished
|
||||
{
|
||||
gHitMarker &= ~HITMARKER_PASSIVE_DAMAGE;
|
||||
gHitMarker &= ~HITMARKER_PASSIVE_HP_UPDATE;
|
||||
gBattleMainFunc = sEndTurnFuncsTable[gBattleOutcome & 0x7F];
|
||||
}
|
||||
else
|
||||
|
||||
Reference in new issue
Block a user