Merge remote-tracking branch 'upstream' into tustin2121-patch-5

1 files changed, 16 insertions, 5 deletions

diff --git a/include/save.h b/include/save.h
index 5e2cf7267..225b2b62c 100644
--- a/include/save.h
+++ b/include/save.h
@@ -55,13 +55,25 @@ enum
     SAVE_HALL_OF_FAME_ERASE_BEFORE // unused
 };
 
+#define SECTOR_ID_SAVEBLOCK2  0
+#define SECTOR_ID_SAVEBLOCK1_START 1
+#define SECTOR_ID_SAVEBLOCK1_END   4
+#define SECTOR_ID_PKMN_STORAGE_START 5
+#define SECTOR_ID_PKMN_STORAGE_END   13
 #define SECTOR_SAVE_SLOT_LENGTH 14
+// Save Slot 1: 0-13;  Save Slot 2: 14-27
 #define SECTOR_ID_HOF_1 28
 #define SECTOR_ID_HOF_2 29
 #define SECTOR_ID_TRAINER_HILL 30
 #define SECTOR_ID_RECORDED_BATTLE  31
 #define SECTORS_COUNT 32
 
+#define SAVE_STATUS_EMPTY    0
+#define SAVE_STATUS_OK       1
+#define SAVE_STATUS_CORRUPT  2
+#define SAVE_STATUS_NO_FLASH 4
+#define SAVE_STATUS_ERROR    0xFF
+
 extern u16 gLastWrittenSector;
 extern u32 gLastSaveCounter;
 extern u16 gLastKnownGoodSector;
@@ -82,13 +94,12 @@ u8 HandleSavingData(u8 saveType);
 u8 TrySavingData(u8 saveType);
 bool8 sub_8153380(void);
 bool8 sub_81533AC(void);
-u8 sub_81533E0(void);
-u8 sub_8153408(void);
-u8 FullSaveGame(void);
+bool8 sub_81533E0(void);
+bool8 sub_8153408(void);
+bool8 FullSaveGame(void);
 bool8 CheckSaveFile(void);
-u8 Save_LoadGameData(u8 a1);
+u8 Save_LoadGameData(u8 saveType);
 u16 sub_815355C(void);
-u8 sub_81534D0(u8);
 u32 TryReadSpecialSaveSection(u8 sector, u8* dst);
 u32 TryWriteSpecialSaveSection(u8 sector, u8* src);
 void sub_8153688(u8 taskId);