diff options
author | huderlem <huderlem@gmail.com> | 2019-11-04 16:31:27 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-04 16:31:27 -0600 |
commit | a4b4ecd470622c2e28bcd9dc93e236a71344dafd (patch) | |
tree | 43a827e7eac7696bd2cbb1c64c828193f2fd2cf1 /src/battle_main.c | |
parent | 347d1e20b62cf18d24084f7dab0291ecc4282564 (diff) | |
parent | 5fd44d1e74019fd07c342f36b3995a6d71fbaab9 (diff) |
Merge pull request #787 from GriffinRichards/rename-tablecmds
Rename table cmds
Diffstat (limited to 'src/battle_main.c')
-rw-r--r-- | src/battle_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 8a4479119..ab8c73ed4 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3954,7 +3954,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; @@ -4017,7 +4017,7 @@ void BattleTurnPassed(void) gHitMarker &= ~(HITMARKER_x100000); gBattleScripting.animTurn = 0; gBattleScripting.animTargetsHit = 0; - gBattleScripting.atk49_state = 0; + gBattleScripting.moveendState = 0; gBattleMoveDamage = 0; gMoveResultFlags = 0; @@ -5885,7 +5885,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; |