From 3ceb1667c9b5e81934c7d608efc08905f21c372e Mon Sep 17 00:00:00 2001
From: Phlosioneer <mattmdrr2@gmail.com>
Date: Fri, 1 Mar 2019 22:32:50 -0500
Subject: Reduce externs

---
 src/battle_controller_link_opponent.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/battle_controller_link_opponent.c')

diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index 05da72e16..6c0f81d41 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -26,15 +26,12 @@
 #include "constants/battle_anim.h"
 #include "constants/songs.h"
 #include "constants/trainers.h"
+#include "recorded_battle.h"
 
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
 
-extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
-extern void sub_81851A8(u8 *);
-extern u16 sub_8068B48(void);
-
 // this file's functions
 static void LinkOpponentHandleGetMonData(void);
 static void LinkOpponentHandleGetRawMonData(void);
-- 
cgit v1.2.3


From e79b6f747b2095bf78336f4b6e6998d818ce8400 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue, 5 Mar 2019 20:07:59 +0100
Subject: Fix Controllers end command function names

---
 src/battle_controller_link_opponent.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/battle_controller_link_opponent.c')

diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index 05da72e16..28ab4c279 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -16,6 +16,7 @@
 #include "palette.h"
 #include "pokeball.h"
 #include "pokemon.h"
+#include "recorded_battle.h"
 #include "reshow_battle_screen.h"
 #include "sound.h"
 #include "string_util.h"
@@ -32,8 +33,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
 
 extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
-extern void sub_81851A8(u8 *);
-extern u16 sub_8068B48(void);
 
 // this file's functions
 static void LinkOpponentHandleGetMonData(void);
@@ -92,7 +91,7 @@ static void LinkOpponentHandleBattleAnimation(void);
 static void LinkOpponentHandleLinkStandbyMsg(void);
 static void LinkOpponentHandleResetActionMoveSelection(void);
 static void LinkOpponentHandleCmd55(void);
-static void nullsub_92(void);
+static void LinkOpponentCmdEnd(void);
 
 static void LinkOpponentBufferRunCommand(void);
 static void LinkOpponentBufferExecCompleted(void);
@@ -164,7 +163,7 @@ static void (*const sLinkOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
     LinkOpponentHandleLinkStandbyMsg,
     LinkOpponentHandleResetActionMoveSelection,
     LinkOpponentHandleCmd55,
-    nullsub_92
+    LinkOpponentCmdEnd
 };
 
 static void nullsub_28(void)
@@ -1857,6 +1856,6 @@ static void LinkOpponentHandleCmd55(void)
     gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
 }
 
-static void nullsub_92(void)
+static void LinkOpponentCmdEnd(void)
 {
 }
-- 
cgit v1.2.3