From 0851c34bac0f38699e3442d8b79c4d7fe52ca71c Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 5 Feb 2021 15:25:12 -0500 Subject: Add berry tree id constants --- src/berry_tag_screen.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src/berry_tag_screen.c') diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index 089228b17..5be149b0f 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -26,7 +26,6 @@ #include "item_menu_icons.h" #include "decompress.h" #include "international_string_util.h" -#include "constants/berry.h" #include "constants/items.h" #include "constants/rgb.h" #include "constants/songs.h" -- cgit v1.2.3 From b71b10623b31065a9a29b43938cf602087bcfc73 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 24 Feb 2021 11:01:02 -0500 Subject: Add palette selection constants --- src/berry_tag_screen.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/berry_tag_screen.c') diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index 5be149b0f..27efb7e7a 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -276,11 +276,11 @@ static bool8 InitBerryTagScreen(void) gMain.state++; break; case 14: - BlendPalettes(-1, 0x10, 0); + BlendPalettes(PALETTES_ALL, 0x10, 0); gMain.state++; break; case 15: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, RGB_BLACK); gPaletteFade.bufferTransferDisabled = 0; gMain.state++; break; @@ -514,7 +514,7 @@ static void DestroyFlavorCircleSprites(void) static void PrepareToCloseBerryTagScreen(u8 taskId) { PlaySE(SE_SELECT); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); gTasks[taskId].func = Task_CloseBerryTagScreen; } -- cgit v1.2.3