summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-08-30 20:25:57 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2018-08-30 20:25:57 +0200
commit43b74032fa981a06e2e66fe5a2d4cf2edaad27c8 (patch)
treeb53a13d201a774c1e4ad1a7073def19c1fc68563 /src
parent917b32ffbe15243207de849683f8933f56bdeb07 (diff)
Make pyramid bag compile.
Diffstat (limited to 'src')
-rw-r--r--src/battle_controller_player.c4
-rw-r--r--src/battle_controller_safari.c2
-rw-r--r--src/battle_controller_wally.c2
3 files changed, 3 insertions, 5 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index ffe8936a0..7f038a0c3 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -28,7 +28,7 @@
#include "pokeball.h"
#include "data2.h"
#include "battle_setup.h"
-#include "item_use.h"
+#include "item_menu.h"
#include "recorded_battle.h"
#include "party_menu.h"
#include "battle_dome.h"
@@ -40,7 +40,6 @@ extern u16 gBattle_BG0_X;
extern u16 gBattle_BG0_Y;
extern struct UnusedControllerStruct gUnknown_02022D0C;
extern struct MusicPlayerInfo gMPlayInfo_BGM;
-extern struct SpriteTemplate gMultiuseSpriteTemplate;
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
@@ -52,7 +51,6 @@ extern void sub_81851A8(u8 *);
// this file's functions
static void PlayerHandleGetMonData(void);
-void PlayerHandleGetRawMonData(void);
static void PlayerHandleSetMonData(void);
static void PlayerHandleSetRawMonData(void);
static void PlayerHandleLoadMonSprite(void);
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index bc97c01f9..aab804b41 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -21,7 +21,7 @@
#include "pokeball.h"
#include "data2.h"
#include "pokeblock.h"
-#include "item_use.h"
+#include "item_menu.h"
extern u16 gBattle_BG0_X;
extern u16 gBattle_BG0_Y;
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index 960181fbc..4faf78681 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -29,7 +29,7 @@
#include "data2.h"
#include "party_menu.h"
#include "battle_setup.h"
-#include "item_use.h"
+#include "item_menu.h"
extern u16 gBattle_BG0_X;
extern u16 gBattle_BG0_Y;