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/diploma.c | |
| parent | 2dfa84c10ff497d73b3a201480fa568ba62e5a38 (diff) | |
| parent | ea748ff7f51a7c119658930f878d046cc8b83c51 (diff) | |
Merge branch 'master' into doc-rtcscreen
Diffstat (limited to 'src/diploma.c')
| -rw-r--r-- | src/diploma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/diploma.c b/src/diploma.c index 8f04bb9ad..bf0d5b057 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -84,7 +84,7 @@ void CB2_ShowDiploma(void) CopyBgTilemapBufferToVram(1); DisplayDiplomaText(); BlendPalettes(-1, 16, 0); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); EnableInterrupts(1); SetVBlankCallback(VBlankCB); SetMainCallback2(MainCB2); @@ -109,7 +109,7 @@ static void Task_DiplomaWaitForKeyPress(u8 taskId) { if (JOY_NEW(A_BUTTON | B_BUTTON)) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); gTasks[taskId].func = Task_DiplomaFadeOut; } } |