diff options
| author | Garak <garakmon@gmail.com> | 2018-08-07 22:21:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-07 22:21:10 -0400 |
| commit | 96ab357bedfb7d4e07a52b518e2bd02375b1f5f5 (patch) | |
| tree | 92c8775f554e682a05c5995c7baa2d130ebd8aa3 /include/battle_util.h | |
| parent | 1ab872c68e951837b6925dbbdf25c4e8d0b63c82 (diff) | |
| parent | 85ebd76cd03e1ee84f182585060b3a79b8653e85 (diff) | |
Merge pull request #3 from pret/master
syncing with source repo
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); |