diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-08-11 12:21:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-11 12:21:26 -0400 |
| commit | 073f315fc3a93142ebe1bd0319dfa2fd4d877f7b (patch) | |
| tree | c7b9aa6fc26634fd6cd6cefc5b86adff674c41c0 /src/battle_main.c | |
| parent | feb54289376a5fafb49f4a1ac35e7b07c79bcd2c (diff) | |
| parent | d4695fffe7260089cb4e4a508ef57e3194de2f44 (diff) | |
Merge pull request #458 from Squeetz/master
Rename and document HITMARKER_x100000
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index a2529c299..f53fc2bce 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -2872,7 +2872,7 @@ void BattleTurnPassed(void) gHitMarker &= ~(HITMARKER_NO_ATTACKSTRING); gHitMarker &= ~(HITMARKER_UNABLE_TO_USE_MOVE); gHitMarker &= ~(HITMARKER_PLAYER_FAINTED); - gHitMarker &= ~(HITMARKER_x100000); + gHitMarker &= ~(HITMARKER_PASSIVE_DAMAGE); gBattleScripting.animTurn = 0; gBattleScripting.animTargetsHit = 0; gBattleScripting.atk49_state = 0; @@ -3609,7 +3609,7 @@ static void RunTurnActionsFunctions(void) if (gCurrentTurnActionNumber >= gBattlersCount) // everyone did their actions, turn finished { - gHitMarker &= ~(HITMARKER_x100000); + gHitMarker &= ~(HITMARKER_PASSIVE_DAMAGE); gBattleMainFunc = sEndTurnFuncsTable[gBattleOutcome & 0x7F]; } else @@ -4343,7 +4343,7 @@ static void HandleAction_NothingIsFainted(void) gCurrentActionFuncId = gActionsByTurnOrder[gCurrentTurnActionNumber]; gHitMarker &= ~(HITMARKER_DESTINYBOND | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_IGNORE_SAFEGUARD | HITMARKER_IGNORE_ON_AIR - | HITMARKER_IGNORE_UNDERGROUND | HITMARKER_IGNORE_UNDERWATER | HITMARKER_x100000 + | HITMARKER_IGNORE_UNDERGROUND | HITMARKER_IGNORE_UNDERWATER | HITMARKER_PASSIVE_DAMAGE | HITMARKER_OBEYS | HITMARKER_x10 | HITMARKER_SYNCHRONISE_EFFECT | HITMARKER_CHARGING | HITMARKER_x4000000); } @@ -4355,7 +4355,7 @@ static void HandleAction_ActionFinished(void) SpecialStatusesClear(); gHitMarker &= ~(HITMARKER_DESTINYBOND | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_IGNORE_SAFEGUARD | HITMARKER_IGNORE_ON_AIR - | HITMARKER_IGNORE_UNDERGROUND | HITMARKER_IGNORE_UNDERWATER | HITMARKER_x100000 + | HITMARKER_IGNORE_UNDERGROUND | HITMARKER_IGNORE_UNDERWATER | HITMARKER_PASSIVE_DAMAGE | HITMARKER_OBEYS | HITMARKER_x10 | HITMARKER_SYNCHRONISE_EFFECT | HITMARKER_CHARGING | HITMARKER_x4000000); gCurrentMove = MOVE_NONE; |