summaryrefslogtreecommitdiff
path: root/src/battle_main.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2019-08-23 08:46:21 -0400
committerGitHub <noreply@github.com>2019-08-23 08:46:21 -0400
commit869d0eebc08cdc246fb711431e8d7149a211e841 (patch)
tree421d6c5c2183e5c283949bd4035ab7b5cc4e60da /src/battle_main.c
parent2cb174b4ea6c84910eab572215d292f6fc329e7b (diff)
Rename atk## constants and states
Diffstat (limited to 'src/battle_main.c')
-rw-r--r--src/battle_main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_main.c b/src/battle_main.c
index 61b6a5a12..498837e10 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -3953,7 +3953,7 @@ static void TryDoEventsBeforeFirstTurn(void)
*(&gBattleStruct->turnEffectsBattlerId) = 0;
*(&gBattleStruct->wishPerishSongState) = 0;
*(&gBattleStruct->wishPerishSongBattlerId) = 0;
- gBattleScripting.atk49_state = 0;
+ gBattleScripting.moveendState = 0;
gBattleStruct->faintedActionsState = 0;
gBattleStruct->turnCountersTracker = 0;
gMoveResultFlags = 0;
@@ -4016,7 +4016,7 @@ void BattleTurnPassed(void)
gHitMarker &= ~(HITMARKER_x100000);
gBattleScripting.animTurn = 0;
gBattleScripting.animTargetsHit = 0;
- gBattleScripting.atk49_state = 0;
+ gBattleScripting.moveendState = 0;
gBattleMoveDamage = 0;
gMoveResultFlags = 0;
@@ -5884,7 +5884,7 @@ static void HandleAction_ActionFinished(void)
gLastHitByType[gBattlerAttacker] = 0;
gBattleStruct->dynamicMoveType = 0;
gDynamicBasePower = 0;
- gBattleScripting.atk49_state = 0;
+ gBattleScripting.moveendState = 0;
gBattleCommunication[3] = 0;
gBattleCommunication[4] = 0;
gBattleScripting.multihitMoveEffect = 0;