diff options
| author | garak <garakmon@gmail.com> | 2018-10-21 15:12:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-21 15:12:18 -0400 |
| commit | 7a9c7e5f068a2ec88ce6fe24a5c72f4b4ae7f48b (patch) | |
| tree | b8e391c9e856a2546075d44cba353c4b100a52ef /src/save_failed_screen.c | |
| parent | 2bb286ab4e3a967ce129d82cdad0ede4d744fa73 (diff) | |
| parent | 804d0a4b6a12907974ffd8cb20f6ed6c527b663b (diff) | |
Merge branch 'master' into sprite-tags
Diffstat (limited to 'src/save_failed_screen.c')
| -rw-r--r-- | src/save_failed_screen.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index 2587bf10a..ae23f8245 100644 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -2,6 +2,7 @@ #include "text.h" #include "main.h" #include "palette.h" +#include "graphics.h" #include "gpu_regs.h" #include "bg.h" #include "decompress.h" @@ -9,18 +10,13 @@ #include "window.h" #include "menu.h" #include "save.h" +#include "starter_choose.h" #include "gba/flash_internal.h" #include "text_window.h" #define MSG_WIN_TOP 12 #define CLOCK_WIN_TOP (MSG_WIN_TOP - 4) -extern const u8 gBirchHelpGfx[]; -extern const u8 gBirchBagTilemap[]; -extern const u8 gBirchGrassTilemap[]; -extern const u16 gBirchBagGrassPal[]; -extern const u16 gUnknown_0860F074[]; - extern u8 gText_SaveFailedCheckingBackup[]; extern u8 gText_BackupMemoryDamaged[]; extern u8 gText_CheckCompleted[]; @@ -148,7 +144,7 @@ static const u8 sClockFrames[8][3] = }; static const u8 sSaveFailedClockPal[] = INCBIN_U8("graphics/misc/clock_small.gbapal"); -static const u8 sSaveFailedClockGfx[] = INCBIN_U8("graphics/misc/clock_small.4bpp.lz"); +static const u32 sSaveFailedClockGfx[] = INCBIN_U32("graphics/misc/clock_small.4bpp.lz"); static void CB2_SaveFailedScreen(void); static void CB2_WipeSave(void); |