diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-11-12 14:14:50 +0000 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-11-12 14:14:50 +0000 |
| commit | 1b895ff52c011d51a9516791148cd5088ba411b5 (patch) | |
| tree | 3f1dee86f96098d38131426e11a0f9c39a1244fe /src/save_failed_screen.c | |
| parent | be33878b94cc38913447682d3e34e674df68619f (diff) | |
| parent | 65f053fd89e09b13e407ac53488043b728660e6e (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
Diffstat (limited to 'src/save_failed_screen.c')
| -rw-r--r-- | src/save_failed_screen.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index 2587bf10a..010279a87 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[]; @@ -99,7 +95,7 @@ static const struct BgTemplate gUnknown_085EFD88[3] = static const struct WindowTemplate gUnknown_085EFD94[] = { { - .priority = 255, + .bg = 255, .tilemapLeft = 0, .tilemapTop = 0, .width = 0, @@ -112,7 +108,7 @@ static const struct WindowTemplate gUnknown_085EFD94[] = static const struct WindowTemplate gUnknown_085EFD9C[] = { { - .priority = 0, + .bg = 0, .tilemapLeft = 1, .tilemapTop = 13, .width = 28, @@ -125,7 +121,7 @@ static const struct WindowTemplate gUnknown_085EFD9C[] = static const struct WindowTemplate gUnknown_085EFDA4[] = { { - .priority = 0, + .bg = 0, .tilemapLeft = 14, .tilemapTop = 9, .width = 2, @@ -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); |