summaryrefslogtreecommitdiff
path: root/src/battle_controller_wally.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle_controller_wally.c')
-rw-r--r--src/battle_controller_wally.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index f1b783b21..6a5b23e59 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -7,7 +7,7 @@
#include "battle_setup.h"
#include "battle_tv.h"
#include "bg.h"
-#include "data2.h"
+#include "data.h"
#include "item.h"
#include "item_menu.h"
#include "link.h"
@@ -30,8 +30,7 @@
#include "constants/moves.h"
#include "constants/songs.h"
#include "constants/trainers.h"
-
-extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
+#include "constants/rgb.h"
// this file's functions
static void WallyHandleGetMonData(void);
@@ -1244,7 +1243,7 @@ static void WallyHandleChooseMove(void)
static void WallyHandleChooseItem(void)
{
- BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gBattlerControllerFuncs[gActiveBattler] = OpenBagAfterPaletteFade;
gBattlerInMenuId = gActiveBattler;
}