summaryrefslogtreecommitdiff
path: root/src/battle_party_menu.c
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2017-07-06 19:28:57 -0500
committercamthesaxman <cameronghall@cox.net>2017-07-06 19:28:57 -0500
commit4aa1b44315ee26fa60015a99ccd51f900e5597fd (patch)
treefdcac19f28b2e4febd96a895e72fce122b9e3b15 /src/battle_party_menu.c
parentad7a7222a538380b446f9aecde44c5222ff3b68a (diff)
parente39f55f55080108ced3ff5cb16b2181d7fec9d92 (diff)
fix merge conflicts
Diffstat (limited to 'src/battle_party_menu.c')
-rw-r--r--src/battle_party_menu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_party_menu.c b/src/battle_party_menu.c
index cf572642e..73b847713 100644
--- a/src/battle_party_menu.c
+++ b/src/battle_party_menu.c
@@ -2,6 +2,7 @@
#include "battle_party_menu.h"
#include "battle.h"
#include "item_menu.h"
+#include "item_use.h"
#include "main.h"
#include "menu.h"
#include "menu_helpers.h"
@@ -55,7 +56,6 @@ extern void nullsub_14();
extern void OpenPartyMenu();
extern u8 sub_803FBBC(void);
-extern u16 gScriptItemId;
extern u8 gPlayerPartyCount;
extern u8 gNoOfAllBanks;
extern u16 gBattlePartyID[];