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 /include/battle_util.h | |
| parent | 759bc2671ce67d1fa13ad068968faa78c26b92a5 (diff) | |
| parent | eb4d9f6fed0c4aaf4c57dd508eaeb67bd60ca56f (diff) | |
Merge pull request #283 from DizzyEggg/battle_pr_again
Battle code enums in switches
Diffstat (limited to 'include/battle_util.h')
| -rw-r--r-- | include/battle_util.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/battle_util.h b/include/battle_util.h index 0531966df..be9b5f1fe 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -59,8 +59,8 @@ u8 TrySetCantSelectMoveBattleScript(void); u8 CheckMoveLimitations(u8 battlerId, u8 unusableMoves, u8 check); bool8 AreAllMovesUnusable(void); u8 GetImprisonedMovesCount(u8 battlerId, u16 move); -u8 UpdateTurnCounters(void); -u8 TurnBasedEffects(void); +u8 DoFieldEndTurnEffects(void); +u8 DoBattlerEndTurnEffects(void); bool8 HandleWishPerishSongOnTurnEnd(void); bool8 HandleFaintedMonActions(void); void TryClearRageStatuses(void); |