From 5f6a55e4fda5d038b3864b23136eb7cd9a8bdbcf Mon Sep 17 00:00:00 2001
From: jiangzhengwenjz <jiangzhengwenjzw@qq.com>
Date: Thu, 22 Aug 2019 14:21:56 +0800
Subject: battle_controller_link_opponent

---
 include/battle_main.h | 1 -
 include/pokemon.h     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/battle_main.h b/include/battle_main.h
index f05c08df2..86de8f39a 100644
--- a/include/battle_main.h
+++ b/include/battle_main.h
@@ -68,7 +68,6 @@ void sub_8039E44(struct Sprite *sprite);
 void sub_8039E60(struct Sprite *sprite);
 void sub_8039E84(struct Sprite *sprite);
 void sub_8039E9C(struct Sprite *sprite);
-void nullsub_20(void);
 void BeginBattleIntro(void);
 void SwitchInClearSetData(void);
 void FaintClearSetData(void);
diff --git a/include/pokemon.h b/include/pokemon.h
index ae966feb2..bf30766a0 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -624,7 +624,7 @@ void DrawSpindaSpots(u16 species, u32 personality, u8 *dest, u8 a4);
 void EvolutionRenameMon(struct Pokemon *mon, u16 oldSpecies, u16 newSpecies);
 bool8 sub_80435E0(void);
 bool8 GetLinkTrainerFlankId(u8 linkPlayerId);
-s32 GetBankMultiplayerId(u16 a1);
+s32 GetBattlerMultiplayerId(u16 a1);
 u8 GetTrainerEncounterMusicId(u16 trainer);
 void AdjustFriendship(struct Pokemon *mon, u8 event);
 void MonGainEVs(struct Pokemon *mon, u16 defeatedSpecies);
-- 
cgit v1.2.3