From 1360b3a477f1107785900cd0c4e73ebf018f058c Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Thu, 4 Apr 2019 17:05:46 -0400 Subject: RGB Constants --- src/battle_controller_safari.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/battle_controller_safari.c') diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index e9da16252..2c6514daa 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -22,6 +22,7 @@ #include "window.h" #include "constants/battle_anim.h" #include "constants/songs.h" +#include "constants/rgb.h" extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; @@ -473,7 +474,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; } -- cgit v1.2.3 From b0223f691fcc83c18b6ba8df5140d907939b04cf Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 4 Apr 2019 23:53:06 +0200 Subject: Clean up data headers --- src/battle_controller_safari.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/battle_controller_safari.c') diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index e9da16252..8f89e4cb5 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" @@ -23,8 +23,6 @@ #include "constants/battle_anim.h" #include "constants/songs.h" -extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; - // this file's functions static void SafariHandleGetMonData(void); static void SafariHandleGetRawMonData(void); -- cgit v1.2.3