From 682e6c85126c6853ab85996ef63f57e4a02651fb Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 18 Nov 2018 20:09:11 +0100 Subject: [PATCH] Use RGB constants in save files --- src/clear_save_data_screen.c | 2 +- src/save_failed_screen.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/clear_save_data_screen.c b/src/clear_save_data_screen.c index eb79f7b5e..72d0daf55 100644 --- a/src/clear_save_data_screen.c +++ b/src/clear_save_data_screen.c @@ -185,7 +185,7 @@ static void CB2_FadeAndDoReset(void) { case 0: default: - BeginNormalPaletteFade(0x0000FFFF, 0, 0, 0x10, 0xFFFF); + BeginNormalPaletteFade(0x0000FFFF, 0, 0, 0x10, RGB_WHITEALPHA); gMain.state = 1; break; case 1: diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index ede9fe672..c668c1db0 100644 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -13,6 +13,7 @@ #include "starter_choose.h" #include "gba/flash_internal.h" #include "text_window.h" +#include "constants/rgb.h" #define MSG_WIN_TOP 12 #define CLOCK_WIN_TOP (MSG_WIN_TOP - 4) @@ -235,7 +236,7 @@ static void CB2_SaveFailedScreen(void) CopyWindowToVram(gSaveFailedWindowIds[CLOCK_WIN_ID], 2); // again? CopyWindowToVram(gSaveFailedWindowIds[TEXT_WIN_ID], 1); SaveFailedScreenTextPrint(gText_SaveFailedCheckingBackup, 1, 0); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); EnableInterrupts(1); SetVBlankCallback(VBlankCB); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);