diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-08-07 22:18:30 +0100 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-08-07 22:18:30 +0100 |
| commit | 704e3c7334f40b101b1f09da63da56576ac86bd2 (patch) | |
| tree | f6a4c60670da605676293713eaad936b188db477 /src/battle_main.c | |
| parent | ab2cc59629bfb8c4809807e82cb5224b4596844a (diff) | |
| parent | 85ebd76cd03e1ee84f182585060b3a79b8653e85 (diff) | |
Merge https://github.com/pret/pokeemerald into spritesheet
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 3212d39f3..86937f85f 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3964,9 +3964,9 @@ void BattleTurnPassed(void) TurnValuesCleanUp(TRUE); if (gBattleOutcome == 0) { - if (UpdateTurnCounters()) + if (DoFieldEndTurnEffects()) return; - if (TurnBasedEffects()) + if (DoBattlerEndTurnEffects()) return; } if (HandleFaintedMonActions()) @@ -4008,7 +4008,7 @@ void BattleTurnPassed(void) gChosenMoveByBattler[i] = MOVE_NONE; } - for (i = 0; i < 4; i++) + for (i = 0; i < MAX_BATTLERS_COUNT; i++) *(gBattleStruct->monToSwitchIntoId + i) = PARTY_SIZE; *(&gBattleStruct->field_91) = gAbsentBattlerFlags; |