diff options
| author | camthesaxman <camthesaxman@users.noreply.github.com> | 2019-07-31 18:29:13 -0500 |
|---|---|---|
| committer | camthesaxman <camthesaxman@users.noreply.github.com> | 2019-07-31 18:29:13 -0500 |
| commit | bbd177fa20a3f53a4815061c524a14e959de6783 (patch) | |
| tree | ac166c12c8555af4672049cb5702a0bbf7ea3aa1 /src/battle_main.c | |
| parent | b74a0c3122113b5ebef469739745e2b8fd420c50 (diff) | |
fix more emerald differences
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 46519307a..85a9a3fea 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -92,7 +92,7 @@ extern u8 gAbsentBattlerFlags; extern u8 gMultiHitCounter; extern u8 gActionForBanks[]; extern u16 gUnknown_02024C2C[]; -extern u16 gLastUsedMove[]; +extern u16 gLastMoves[]; extern u16 gLastLandedMoves[]; extern u16 gLastHitByType[]; extern u16 gUnknown_02024C4C[]; @@ -3329,7 +3329,7 @@ void sub_8010874(void) MEMSET_ALT(&gDisableStructs[i], 0, 0x1C, j, r4); gDisableStructs[i].isFirstTurn= 2; gUnknown_02024C70[i] = 0; - gLastUsedMove[i] = 0; + gLastMoves[i] = 0; gLastLandedMoves[i] = 0; gLastHitByType[i] = 0; gUnknown_02024C4C[i] = 0; @@ -3484,7 +3484,7 @@ void SwitchInClearSetData(void) } gDisableStructs[gActiveBattler].isFirstTurn= 2; - gLastUsedMove[gActiveBattler] = 0; + gLastMoves[gActiveBattler] = 0; gLastLandedMoves[gActiveBattler] = 0; gLastHitByType[gActiveBattler] = 0; gUnknown_02024C4C[gActiveBattler] = 0; @@ -3548,7 +3548,7 @@ void UndoEffectsAfterFainting(void) gProtectStructs[gActiveBattler].notFirstStrike = 0; gDisableStructs[gActiveBattler].isFirstTurn= 2; - gLastUsedMove[gActiveBattler] = 0; + gLastMoves[gActiveBattler] = 0; gLastLandedMoves[gActiveBattler] = 0; gLastHitByType[gActiveBattler] = 0; gUnknown_02024C4C[gActiveBattler] = 0; @@ -3981,7 +3981,7 @@ void BattleTurnPassed(void) TurnValuesCleanUp(1); if (gBattleOutcome == 0) { - if (UpdateTurnCounters() != 0) + if (DoFieldEndTurnEffects() != 0) return; if (TurnBasedEffects() != 0) return; |