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_wally.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/battle_controller_wally.c') diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index f1b783b21..c131df0ca 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -30,6 +30,7 @@ #include "constants/moves.h" #include "constants/songs.h" #include "constants/trainers.h" +#include "constants/rgb.h" extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; @@ -1244,7 +1245,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; } -- 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_wally.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/battle_controller_wally.c') diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index f1b783b21..a504f5a80 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" @@ -31,8 +31,6 @@ #include "constants/songs.h" #include "constants/trainers.h" -extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; - // this file's functions static void WallyHandleGetMonData(void); static void WallyHandleGetRawMonData(void); -- cgit v1.2.3