ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-27 13:53:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use RGB constants in save files

Browse Source
This commit is contained in:
DizzyEggg 2018-11-18 20:09:11 +01:00
parent 7ce3473b0e
commit 682e6c8512
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/clear_save_data_screen.c
View File

@ -185,7 +185,7 @@ static void CB2_FadeAndDoReset(void)
{ {
case 0: case 0:
default: default:
BeginNormalPaletteFade(0x0000FFFF, 0, 0, 0x10, 0xFFFF); BeginNormalPaletteFade(0x0000FFFF, 0, 0, 0x10, RGB_WHITEALPHA);
gMain.state = 1; gMain.state = 1;
break; break;
case 1: case 1:

3
src/save_failed_screen.c
View File

@ -13,6 +13,7 @@
#include "starter_choose.h" #include "starter_choose.h"
#include "gba/flash_internal.h" #include "gba/flash_internal.h"
#include "text_window.h" #include "text_window.h"
#include "constants/rgb.h"
#define MSG_WIN_TOP 12 #define MSG_WIN_TOP 12
#define CLOCK_WIN_TOP (MSG_WIN_TOP - 4) #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[CLOCK_WIN_ID], 2); // again?
CopyWindowToVram(gSaveFailedWindowIds[TEXT_WIN_ID], 1); CopyWindowToVram(gSaveFailedWindowIds[TEXT_WIN_ID], 1);
SaveFailedScreenTextPrint(gText_SaveFailedCheckingBackup, 1, 0); SaveFailedScreenTextPrint(gText_SaveFailedCheckingBackup, 1, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
EnableInterrupts(1); EnableInterrupts(1);
SetVBlankCallback(VBlankCB); SetVBlankCallback(VBlankCB);
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);