diff options
author | Marcus Huderle <huderlem@gmail.com> | 2019-03-17 17:20:40 -0500 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2019-03-17 17:20:40 -0500 |
commit | e9a3cc6d51ce3818eed11de585f5084342450093 (patch) | |
tree | 414ed687f836521c1a966531e87122951c070083 /src/save.c | |
parent | c3feb9871f4d05cd9874dd8fc0c2016eaa072864 (diff) | |
parent | 4ae8a52473a0e4842cf140bf0c59f0276125a896 (diff) |
Merge remote-tracking branch 'upstream/master' into move-tutor
# Conflicts:
# include/pokenav.h
# src/battle_script_commands.c
Diffstat (limited to 'src/save.c')
-rw-r--r-- | src/save.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/save.c b/src/save.c index 4444e122c..361a88e1e 100644 --- a/src/save.c +++ b/src/save.c @@ -1,5 +1,7 @@ #include "global.h" +#include "agb_flash.h" #include "gba/flash_internal.h" +#include "fieldmap.h" #include "save.h" #include "task.h" #include "decompress.h" @@ -8,6 +10,7 @@ #include "pokemon_storage_system.h" #include "main.h" #include "trainer_hill.h" +#include "link.h" #include "constants/game_stat.h" static u16 CalculateChecksum(void *data, u16 size); @@ -70,12 +73,6 @@ const struct SaveSectionOffsets gSaveSectionOffsets[] = SAVEBLOCK_CHUNK(gPokemonStorage, 8), }; -extern void DoSaveFailedScreen(u8); // save_failed_screen -extern bool32 ProgramFlashSectorAndVerify(u8 sector, u8 *data); -extern void save_serialize_map(void); -extern void sub_800ADF8(void); -extern bool8 IsLinkTaskFinished(void); - // iwram common u16 gLastWrittenSector; u32 gLastSaveCounter; |