address PR feedback - pointer spacing, some names, removing unnecessa…

…ry parens
pret · Apr 1, 2024 · 784d09b · 784d09b
1 parent 72675f9
commit 784d09b
Show file tree

Hide file tree

Showing 3 changed files with 96 additions and 93 deletions.
diff --git a/include/constants/savedata/savedata.h b/include/constants/savedata/savedata.h
@@ -24,8 +24,9 @@ enum SaveSectorResult {
 enum SaveSectorID {
 	SECTOR_ID_PRIMARY = 0,
 	SECTOR_ID_BACKUP,
+	SECTOR_ID_ERROR,
 
-	SECTOR_ID_MAX = 2,	// also used to indicate an error
+	SECTOR_ID_MAX = SECTOR_ID_ERROR,
 };
 
 

diff --git a/include/savedata.h b/include/savedata.h
@@ -39,10 +39,10 @@ typedef struct SaveDataState {
     int currentBlock;
     int endBlock;
     s32 lockID;
-    int stateSequence;
+    int mainSequence;
     u32 globalCounterBackup;
     u32 blockCounterBackup[SAVE_BLOCK_ID_MAX];
-    volatile BOOL isLocked;
+    volatile BOOL locked;
 } SaveDataState;
 
 typedef struct SaveData {
@@ -57,7 +57,7 @@ typedef struct SaveData {
     u8 blockOffsets[SAVE_BLOCK_ID_MAX];
     SavePageInfo pageInfo[SAVE_TABLE_ENTRY_MAX];
     SaveBlockInfo blockInfo[SAVE_BLOCK_ID_MAX];
-    SaveDataState saveState;
+    SaveDataState state;
     int unk_202C4;
     u32 unk_202C8;
 } SaveData;