diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-20 17:16:56 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-20 17:16:56 +0100 |
| commit | b615af4184108b83227a24aac1eff7ec0a0cc749 (patch) | |
| tree | b74e22f9c574a7e690c2f239f63d1f39f2f3614f /src/save_failed_screen.c | |
| parent | cb229f56e8951e3f9efc35516447a54e18e8fef0 (diff) | |
| parent | 7e6a68a99a832383e7cbf3c91aef321dd46ed61f (diff) | |
fix pokeblock merge conflicts
Diffstat (limited to 'src/save_failed_screen.c')
| -rwxr-xr-x | src/save_failed_screen.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index ef01f0293..218ef68d7 100755 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -154,8 +154,8 @@ static const u8 sClockFrames[8][3] = { 5, 1, 0 }, }; -static const u8 gSaveFailedClockPal[] = INCBIN_U8("graphics/misc/clock_small.gbapal"); -static const u8 gSaveFailedClockGfx[] = INCBIN_U8("graphics/misc/clock_small.4bpp.lz"); +static const u8 sSaveFailedClockPal[] = INCBIN_U8("graphics/misc/clock_small.gbapal"); +static const u8 sSaveFailedClockGfx[] = INCBIN_U8("graphics/misc/clock_small.4bpp.lz"); static void CB2_SaveFailedScreen(void); static void CB2_WipeSave(void); @@ -221,7 +221,7 @@ static void CB2_SaveFailedScreen(void) LZ77UnCompVram(gBirchHelpGfx, (void *)VRAM); LZ77UnCompVram(gBirchBagTilemap, (void *)(VRAM + 0x7000)); LZ77UnCompVram(gBirchGrassTilemap, (void *)(VRAM + 0x7800)); - LZ77UnCompVram(gSaveFailedClockGfx, (void *)(VRAM + 0x10020)); + LZ77UnCompVram(sSaveFailedClockGfx, (void *)(VRAM + 0x10020)); ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, gUnknown_085EFD88, 3); SetBgTilemapBuffer(0, (void *)&gDecompressionBuffer[0x2000]); @@ -238,7 +238,7 @@ static void CB2_SaveFailedScreen(void) ResetTasks(); ResetPaletteFade(); LoadPalette(gBirchBagGrassPal, 0, 0x40); - LoadPalette(gSaveFailedClockPal, 0x100, 0x20); + LoadPalette(sSaveFailedClockPal, 0x100, 0x20); LoadPalette(gUnknown_0850FEFC, 0xE0, 0x20); LoadPalette(gUnknown_0860F074, 0xF0, 0x20); SetWindowBorderStyle(gSaveFailedWindowIds[TEXT_WIN_ID], FALSE, 0x214, 0xE); |