Merge https://github.com/pret/pokeemerald into spritesheet

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);