Merge pull request #474 from lioniac/master

Multiple renamings and removed some orphaned functions

1 files changed, 2 insertions, 2 deletions

diff --git a/include/battle_util.h b/include/battle_util.h
index d3bd76a01..edec94444 100644
--- a/include/battle_util.h
+++ b/include/battle_util.h
@@ -58,12 +58,12 @@ void PressurePPLoseOnUsingImprison(u8 attacker);
 void PressurePPLoseOnUsingPerishSong(u8 attacker);
 void MarkAllBattlersForControllerExec(void);
 void MarkBattlerForControllerExec(u8 battlerId);
-void sub_8017298(u8 arg0);
+void MarkBattlerReceivedLinkData(u8 battlerId);
 void CancelMultiTurnMoves(u8 battler);
 bool8 WasUnableToUseMove(u8 battler);
 void PrepareStringBattle(u16 stringId, u8 battler);
 void ResetSentPokesToOpponentValue(void);
-void sub_8017434(u8 battler);
+void OpponentSwitchInResetSentPokesToOpponentValue(u8 battler);
 void UpdateSentPokesToOpponentValue(u8 battler);
 void BattleScriptPush(const u8 *bsPtr);
 void BattleScriptPushCursor(void);