summaryrefslogtreecommitdiff
path: root/src/pokeblock_feed.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-06-25 17:50:27 -0500
committerMarcus Huderle <huderlem@gmail.com>2018-06-25 17:50:27 -0500
commit605f8ac1141daf66d3428923e004f82f5a5e1594 (patch)
treea3e5fae5d271175c7f10b6b455fcdc7f0fdd553e /src/pokeblock_feed.c
parente88e39d5fda1644f77e41fd652d4310612da7532 (diff)
parent659437f07a44b6f560bb58d6c12d141ed8ba7643 (diff)
Merge branch 'master' into contest_link_80C2020
Diffstat (limited to 'src/pokeblock_feed.c')
-rw-r--r--src/pokeblock_feed.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c
index 2f2ce2f8f..588bc85c0 100644
--- a/src/pokeblock_feed.c
+++ b/src/pokeblock_feed.c
@@ -579,7 +579,7 @@ static bool8 TransitionToPokeblockFeedScene(void)
gMain.state++;
}
case 13:
- BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0));
gPaletteFade.bufferTransferDisabled = 0;
SetMainCallback2(CB2_PokeblockFeed);
return TRUE;
@@ -751,7 +751,7 @@ static void Task_ReturnAfterPaletteFade(u8 taskID)
static void Task_PaletteFadeToReturn(u8 taskID)
{
- BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
gTasks[taskID].func = Task_ReturnAfterPaletteFade;
}