diff options
author | scnorton <scnorton@biociphers.org> | 2017-06-28 17:37:17 -0400 |
---|---|---|
committer | scnorton <scnorton@biociphers.org> | 2017-06-28 17:37:17 -0400 |
commit | 26a48d7e926d3c7841a28b2af8cbbd170923469e (patch) | |
tree | fa83e9a7105769c66e3a66b3c6871984293db329 /src/save_failed_screen.c | |
parent | 39efcb2a6d169fba0ff33f1bd25e2947b74881a0 (diff) | |
parent | 06b6cada0ddedc62063171703ba6607019751a9a (diff) |
Merge branch 'master' into use_pokeblock
Diffstat (limited to 'src/save_failed_screen.c')
-rw-r--r-- | src/save_failed_screen.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index a3de0bd00..a64b3eb5f 100644 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -1,12 +1,13 @@ #include "global.h" #include "gba/flash_internal.h" -#include "asm.h" +#include "save_failed_screen.h" #include "m4a.h" #include "main.h" #include "menu.h" #include "palette.h" #include "save.h" #include "sprite.h" +#include "starter_choose.h" #include "strings.h" #include "task.h" #include "text.h" @@ -35,12 +36,6 @@ extern struct SaveFailedClockStruct gSaveFailedClockInfo; extern u32 gDamagedSaveSectors; extern u32 gGameContinueCallback; -extern u8 gBirchHelpGfx[]; - -extern u8 gBirchGrassTilemap[]; -extern u8 gBirchBagTilemap[]; -extern u8 gBirchBagGrassPal[0x40]; - static const struct OamData sClockOamData = { 160, // Y |