diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-28 10:28:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-28 10:28:43 -0500 |
| commit | 1912b0cf0a0f42f23200ecffcb22651015478ef6 (patch) | |
| tree | d855404809d36965aaa76784bae08bdf6ea92cc7 /src/fldeff_misc.c | |
| parent | 2dfa84c10ff497d73b3a201480fa568ba62e5a38 (diff) | |
| parent | ea748ff7f51a7c119658930f878d046cc8b83c51 (diff) | |
Merge branch 'master' into doc-rtcscreen
Diffstat (limited to 'src/fldeff_misc.c')
| -rw-r--r-- | src/fldeff_misc.c | 4 |
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)); |