summaryrefslogtreecommitdiff
path: root/src/battle_controller_safari.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle_controller_safari.c')
-rw-r--r--src/battle_controller_safari.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index e9da16252..c39b904c9 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -5,7 +5,7 @@
#include "battle_interface.h"
#include "battle_message.h"
#include "bg.h"
-#include "data2.h"
+#include "data.h"
#include "item_menu.h"
#include "link.h"
#include "main.h"
@@ -22,8 +22,7 @@
#include "window.h"
#include "constants/battle_anim.h"
#include "constants/songs.h"
-
-extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
+#include "constants/rgb.h"
// this file's functions
static void SafariHandleGetMonData(void);
@@ -473,7 +472,7 @@ static void SafariHandleChooseItem(void)
{
s32 i;
- BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gBattlerControllerFuncs[gActiveBattler] = SafariOpenPokeblockCase;
gBattlerInMenuId = gActiveBattler;
}