diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-08-04 18:31:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-04 18:31:49 -0700 |
| commit | 002016e7643c807997f0a85c9457db2b53f5a76b (patch) | |
| tree | 73e111efb954abc2cd18e89d8679336eb29e88d3 /src/battle_main.c | |
| parent | 759bc2671ce67d1fa13ad068968faa78c26b92a5 (diff) | |
| parent | eb4d9f6fed0c4aaf4c57dd508eaeb67bd60ca56f (diff) | |
Merge pull request #283 from DizzyEggg/battle_pr_again
Battle code enums in switches
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; |