dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into doc-rtcscreen

Browse Source
This commit is contained in:
GriffinR
2021-02-28 10:28:43 -05:00
committed by GitHub
parent 2dfa84c10f ea748ff7f5
commit 1912b0cf0a
165 changed files with 4500 additions and 3973 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/reset_rtc_screen.c
View File

@@ -642,7 +642,7 @@ static void Task_ResetRtcScreen(u8 taskId)
switch (tState)
{
case MAINSTATE_FADE_IN:
BeginNormalPaletteFade(0xFFFFFFFF, 1, 0x10, 0, RGB_WHITEALPHA);
BeginNormalPaletteFade(PALETTES_ALL, 1, 0x10, 0, RGB_WHITEALPHA);
tState = MAINSTATE_CHECK_SAVE;
break;
case MAINSTATE_CHECK_SAVE:
@@ -716,7 +716,7 @@ static void Task_ResetRtcScreen(u8 taskId)
case MAINSTATE_WAIT_EXIT:
if (JOY_NEW(A_BUTTON))
{
BeginNormalPaletteFade(0xFFFFFFFF, 1, 0, 0x10, RGB_WHITEALPHA);
BeginNormalPaletteFade(PALETTES_ALL, 1, 0, 0x10, RGB_WHITEALPHA);
tState = MAINSTATE_EXIT;
// fallthrough
}