diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-05-11 21:22:09 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-05-11 21:22:09 -0400 |
| commit | 539d47279625a3d7a274726a02468bb5c1c56514 (patch) | |
| tree | 08f68b473f37d1a74396ef2e28e1a0cecc60a9f1 /src/battle_controller_wally.c | |
| parent | a58d9a16dd7e4f263ebccda50e70103e7490886b (diff) | |
| parent | fc72b74e6ca6626dbaffa353eabf49429ff5e75f (diff) | |
Merge branch 'master' into dodrio_berry_picking
Diffstat (limited to 'src/battle_controller_wally.c')
| -rw-r--r-- | src/battle_controller_wally.c | 7 |
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; } |