summaryrefslogtreecommitdiff
path: root/src/fldeff_misc.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-02-28 10:26:49 -0500
committerGitHub <noreply@github.com>2021-02-28 10:26:49 -0500
commitea748ff7f51a7c119658930f878d046cc8b83c51 (patch)
tree3616ea8ad0a2b3f05482ffd3b9db929a8b5f4573 /src/fldeff_misc.c
parent70c560cc84ec4152438815a7abae673ae6f589f8 (diff)
parent293df1887f4b849e96d06530c722bd39afb7b72b (diff)
Merge pull request #1344 from GriffinRichards/doc-ec
Document easy chat and mail, script.c cleanup, add/use some general constants
Diffstat (limited to 'src/fldeff_misc.c')
-rw-r--r--src/fldeff_misc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c
index 7eae8cfd1..b320f3eb0 100644
--- a/src/fldeff_misc.c
+++ b/src/fldeff_misc.c
@@ -387,7 +387,7 @@ static void Task_ComputerScreenOpenEffect(u8 taskId)
task->tWinRight = DISPLAY_WIDTH;
SetGpuReg(REG_OFFSET_BLDY, 0);
SetGpuReg(REG_OFFSET_BLDCNT, task->tBlendCnt);
- BlendPalettes(0xFFFFFFFF, 0, 0);
+ BlendPalettes(PALETTES_ALL, 0, 0);
gPlttBufferFaded[0] = 0;
}
SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->tWinLeft, task->tWinRight));
@@ -463,7 +463,7 @@ static void Task_ComputerScreenCloseEffect(u8 taskId)
{
task->tWinLeft = DISPLAY_WIDTH / 2;
task->tWinRight = DISPLAY_WIDTH / 2;
- BlendPalettes(-1, 16, 0);
+ BlendPalettes(PALETTES_ALL, 16, 0);
gPlttBufferFaded[0] = 0;
}
SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->tWinLeft, task->tWinRight));