1 files changed, 8 insertions, 11 deletions
diff --git a/src/save.c b/src/save.c
index a22e20f0b..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;
@@ -659,10 +656,10 @@ static void UpdateSaveAddresses(void)
 u8 HandleSavingData(u8 saveType)
 {
     u8 i;
-    u32 *backupVar = gUnknown_0203CF5C;
+    u32 *backupVar = gTrainerHillVBlankCounter;
     u8 *tempAddr;
 
-    gUnknown_0203CF5C = NULL;
+    gTrainerHillVBlankCounter = NULL;
     UpdateSaveAddresses();
     switch (saveType)
     {
@@ -705,7 +702,7 @@ u8 HandleSavingData(u8 saveType)
         save_write_to_flash(0xFFFF, gRamSaveSectionLocations);
         break;
     }
-    gUnknown_0203CF5C = backupVar;
+    gTrainerHillVBlankCounter = backupVar;
     return 0;
 }
 
@@ -768,7 +765,7 @@ u8 sub_8153408(void) // trade.s save
     return 0;
 }
 
-u8 sub_8153430(void)
+u8 FullSaveGame(void)
 {
     if (gFlashMemoryPresent != TRUE)
         return 1;
@@ -780,7 +777,7 @@ u8 sub_8153430(void)
     return 0;
 }
 
-bool8 sub_8153474(void)
+bool8 CheckSaveFile(void)
 {
     u8 retVal = FALSE;
     u16 val = ++gUnknown_03006208;