summaryrefslogtreecommitdiff
path: root/src/battle_controller_player_partner.c
diff options
context:
space:
mode:
authorgarak <garakmon@gmail.com>2018-12-03 16:58:28 -0500
committergarak <garakmon@gmail.com>2018-12-03 16:58:28 -0500
commit2c14d6ee6c40f4b7e5cd9366080ce911d67be718 (patch)
tree4a70ca275a2f161d2d23f63d0608f92d8ea08acb /src/battle_controller_player_partner.c
parentd6a88e0eaa7d74f187fb27f8a376203f40537340 (diff)
parentd9a5de5317d4589b139f9532a7e8bf3b851e673f (diff)
fix merge conflicts
Diffstat (limited to 'src/battle_controller_player_partner.c')
-rw-r--r--src/battle_controller_player_partner.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index bd892c922..02dd1383b 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -6,6 +6,7 @@
#include "battle_message.h"
#include "battle_interface.h"
#include "battle_setup.h"
+#include "battle_tower.h"
#include "bg.h"
#include "data2.h"
#include "item_use.h"
@@ -26,15 +27,11 @@
#include "constants/songs.h"
#include "constants/trainers.h"
-extern struct UnusedControllerStruct gUnknown_02022D0C;
-
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
extern void sub_81358F4(void);
extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
-extern void SetMultiuseSpriteTemplateToPokemon(u16, u8);
-extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
// this file's functions
static void PlayerPartnerHandleGetMonData(void);