diff --git a/include/savedata/save_table.h b/include/savedata/save_table.h
index 7938ec70ba..394f243828 100644
--- a/include/savedata/save_table.h
+++ b/include/savedata/save_table.h
@@ -33,98 +33,98 @@ extern const int gExtraSaveTableSize;
  *
  * This routine also performs a standard CRC of the sector before loading it.
  *
- * @param save
+ * @param saveData
  * @return Address of the TVBroadcast sector of the save data.
  */
-TVBroadcast *SaveData_GetTVBroadcast(SaveData *save);
+TVBroadcast *SaveData_GetTVBroadcast(SaveData *saveData);
 
 /**
  * @brief Loads the PCBoxes sector of the save data.
  *
  * This routine does NOT perform any CRC on the sectors before loading them.
  *
- * @param save
+ * @param saveData
  * @return Address of the PCBoxes sector of the save data.
  */
-PCBoxes *SaveData_GetPCBoxes(SaveData *save);
+PCBoxes *SaveData_GetPCBoxes(SaveData *saveData);
 
 /**
  * @brief Loads the MysteryGift sector of the save data.
  *
  * This routine also performs a standard CRC of the sector before loading it.
  *
- * @param save
+ * @param saveData
  * @return Address of the MysteryGift sector of the save data.
  */
-MysteryGift *SaveData_GetMysteryGift(SaveData *save);
+MysteryGift *SaveData_GetMysteryGift(SaveData *saveData);
 
 /**
  * @brief Loads the PalParkTransfer sector of the save data.
  *
  * This routine does NOT perform any CRC on the sectors before loading them.
  *
- * @param save
+ * @param saveData
  * @return Address of the PalParkTransfer sector of the save data.
  */
-PalParkTransfer *SaveData_GetPalParkTransfer(SaveData *save);
+PalParkTransfer *SaveData_GetPalParkTransfer(SaveData *saveData);
 
 /**
  * @brief Loads the HallOfFame sector from the extended save data.
  *
- * @param save          The save data.
+ * @param saveData      The save data.
  * @param heapID        Heap on which to allocate the HallOfFame sector.
  * @param resultCode    Load-result opcode output.
  * @return Address of the allocated HallOfFame data.
  */
-HallOfFame *SaveData_HallOfFame(SaveData *save, int heapID, int *resultCode);
+HallOfFame *SaveData_HallOfFame(SaveData *saveData, int heapID, int *resultCode);
 
 /**
  * @brief Saves a mirror of the given HallOfFame data into the extended save.
  *
- * @param save          The save data.
+ * @param saveData      The save data.
  * @param hof           The hall-of-fame data to save.
  * @return Save-result opcode.
  */
-int SaveData_SaveHallOfFame(SaveData *save, HallOfFame *hof);
+int SaveData_SaveHallOfFame(SaveData *saveData, HallOfFame *hof);
 
 /**
  * @brief Loads the BattleRecording sector from the extended save data.
  *
- * @param save          The save data.
+ * @param saveData      The save data.
  * @param heapID        Heap on which to allocate the BattleRecording sector.
  * @param resultCode    Load-result opcode output.
  * @param recNum        Which recording slot to load.
  * @return Address of the allocated BattleRecording data.
  */
-BattleRecording *SaveData_BattleRecording(SaveData *save, int heapID, int *resultCode, int recNum);
+BattleRecording *SaveData_BattleRecording(SaveData *saveData, int heapID, int *resultCode, int recNum);
 
 /**
  * @brief Saves a mirror of the given BattleRecording data into the extended save.
  *
- * @param save          The save data.
+ * @param saveData      The save data.
  * @param rec           The battle recording data to save.
  * @param recNum        Which recording slot to save.
  * @return Save-result opcode.
  */
-int SaveData_SaveBattleRecording(SaveData *save, BattleRecording *rec, int recNum);
+int SaveData_SaveBattleRecording(SaveData *saveData, BattleRecording *rec, int recNum);
 
 /**
  * @brief Loads the BattleFrontierStage sector from the extended save data.
  *
- * @param save          The save data.
+ * @param saveData      The save data.
  * @param heapID        Heap on which to allocate the BattleRecording sector.
  * @param resultCode    Load-result opcode output.
  * @return Address of the allocated BattleFrontierStage data.
  */
-BattleFrontierStage *SaveData_BattleFrontierStage(SaveData *save, int heapID, int *resultCode);
+BattleFrontierStage *SaveData_BattleFrontierStage(SaveData *saveData, int heapID, int *resultCode);
 
 /**
  * @brief Saves a mirror of the given BattleRecording data into the extended save.
  *
- * @param save          The save data.
+ * @param saveData      The save data.
  * @param frontier      The battle frontier data to save.
  * @return Save-result opcode.
  */
-int SaveData_SaveBattleFrontierStage(SaveData *save, BattleFrontierStage *frontier);
+int SaveData_SaveBattleFrontierStage(SaveData *saveData, BattleFrontierStage *frontier);
 
 #endif // POKEPLATINUM_SAVEDATA_LOAD_HELPERS_H
diff --git a/include/special_encounter.h b/include/special_encounter.h
index c67da79c1a..35cd11bcf8 100644
--- a/include/special_encounter.h
+++ b/include/special_encounter.h
@@ -28,12 +28,12 @@ void SpecialEncounter_Init(SpecialEncounter *speEnc);
 void SpecialEncounter_SetMixedRecordDailies(SpecialEncounter *speEnc, const u32 mixedRecord);
 u32 SpecialEncounter_GetDailyMon(SpecialEncounter *speEnc, const u8 dailyType);
 RadarChainRecords *SpecialEncounter_GetRadarChainRecords(SpecialEncounter *speEnc);
-SpecialEncounter *SaveData_GetSpecialEncounters(SaveData *sDat);
+SpecialEncounter *SaveData_GetSpecialEncounters(SaveData *saveData);
 PlayerHoneyTreeStates *SpecialEncounter_GetPlayerHoneyTreeStates(SpecialEncounter *speEnc);
 const int SpecialEncounter_GetLastSlatheredTreeId(PlayerHoneyTreeStates *treeDat);
 void SpecialEncounter_SetLastSlatheredTreeId(const u8 treeId, PlayerHoneyTreeStates *treeDat);
 HoneyTree *SpecialEncounter_GetHoneyTree(const u8 treeId, PlayerHoneyTreeStates *treeDat);
-void SpecialEncounter_DecrementHoneyTreeTimers(SaveData *save, const int decrement);
+void SpecialEncounter_DecrementHoneyTreeTimers(SaveData *saveData, const int decrement);
 void SpecialEncounter_EnableSwarms(SaveData *saveData);
 u8 SpecialEncounter_IsSwarmEnabled(SpecialEncounter *speEnc);
 void SpecialEncounter_UpdateRecentRoutes(SpecialEncounter *speEnc, const int newMap);
diff --git a/include/system_data.h b/include/system_data.h
index 97aa0fa801..14f0e28f66 100644
--- a/include/system_data.h
+++ b/include/system_data.h
@@ -29,7 +29,7 @@ typedef struct SystemData {
 
 int SystemData_SaveSize(void);
 void SystemData_Clear(SystemData *systemData);
-SystemData *SaveData_GetSystemData(SaveData *systemData);
+SystemData *SaveData_GetSystemData(SaveData *saveData);
 GameTime *SaveData_GetGameTime(SaveData *saveData);
 void SystemData_Init(SystemData *systemData);
 BOOL SystemData_MatchesCurrentSystem(const SystemData *systemData);
diff --git a/include/unk_02014D38.h b/include/unk_02014D38.h
index fc09826c96..161c843f83 100644
--- a/include/unk_02014D38.h
+++ b/include/unk_02014D38.h
@@ -16,7 +16,7 @@ u16 sub_02014DFC(u32 param0, u32 param1);
 BOOL sub_02014E4C(u16 param0, u32 *param1, u32 *param2);
 u32 Sentence_SaveSize(void);
 void Sentence_Init(void *param0);
-UnkStruct_02014EC4 *sub_02014EC4(SaveData *param0);
+UnkStruct_02014EC4 *sub_02014EC4(SaveData *saveData);
 BOOL sub_02014ED8(const UnkStruct_02014EC4 *param0, u32 param1);
 u32 sub_02014EE4(UnkStruct_02014EC4 *param0);
 BOOL sub_02014F48(UnkStruct_02014EC4 *param0);
diff --git a/include/unk_0202602C.h b/include/unk_0202602C.h
index 787f59fa45..56aa9c3a6e 100644
--- a/include/unk_0202602C.h
+++ b/include/unk_0202602C.h
@@ -14,7 +14,7 @@ void RegulationBattles_Init(UnkStruct_02026030 *param0);
 void sub_0202604C(const BattleRegulation *param0, Strbuf *param1);
 Strbuf *sub_0202605C(const BattleRegulation *param0, int param1);
 int sub_02026074(const BattleRegulation *param0, int param1);
-BattleRegulation *sub_0202610C(SaveData *param0, int param1);
-void sub_0202613C(SaveData *param0, const BattleRegulation *param1);
+BattleRegulation *sub_0202610C(SaveData *saveData, int param1);
+void sub_0202613C(SaveData *saveData, const BattleRegulation *param1);
 
 #endif // POKEPLATINUM_UNK_0202602C_H
diff --git a/include/unk_02026150.h b/include/unk_02026150.h
index 8ac19c7535..cff760862a 100644
--- a/include/unk_02026150.h
+++ b/include/unk_02026150.h
@@ -6,7 +6,7 @@
 #include "savedata.h"
 #include "strbuf.h"
 
-const BattleRegulation *sub_02026150(SaveData *param0, int param1);
+const BattleRegulation *sub_02026150(SaveData *saveData, int param1);
 void sub_0202616C(SaveData *param0, int param1, Strbuf *param2, int param3);
 const BattleRegulation *sub_020261A8(void);
 int sub_020261B0(const BattleRegulation *param0);
diff --git a/include/unk_02027F84.h b/include/unk_02027F84.h
index acf0eb3da9..7fab392c43 100644
--- a/include/unk_02027F84.h
+++ b/include/unk_02027F84.h
@@ -6,7 +6,7 @@
 #include "savedata.h"
 
 int PalPad_SaveSize(void);
-UnkStruct_02027F8C *sub_02027F8C(SaveData *param0);
+UnkStruct_02027F8C *sub_02027F8C(SaveData *saveData);
 void PalPad_Init(UnkStruct_02027F8C *param0);
 const u16 *sub_02027FBC(const UnkStruct_02027F8C *param0, int param1);
 u8 sub_02027FC4(const UnkStruct_02027F8C *param0, int param1);
diff --git a/include/unk_02028124.h b/include/unk_02028124.h
index 5a0f8c6a68..bbb757de8e 100644
--- a/include/unk_02028124.h
+++ b/include/unk_02028124.h
@@ -23,7 +23,7 @@ u16 sub_02028328(const Mail *param0, u8 param1, u8 param2, u16 param3);
 u16 sub_02028408(const Mail *param0);
 Sentence *sub_0202840C(Mail *param0, u8 param1);
 void sub_0202841C(Mail *param0, Sentence *param1, u8 param2);
-UnkStruct_02028430 *sub_02028430(SaveData *param0);
+UnkStruct_02028430 *sub_02028430(SaveData *saveData);
 int Mail_SaveSize(void);
 void Mail_Init(UnkStruct_02028430 *param0);
 int sub_0202845C(UnkStruct_02028430 *param0, int param1);
diff --git a/include/unk_0202854C.h b/include/unk_0202854C.h
index 7952e5d9d0..9c571fb931 100644
--- a/include/unk_0202854C.h
+++ b/include/unk_0202854C.h
@@ -128,8 +128,8 @@ int sub_02029874(const UnkStruct_02029894 *param0);
 int sub_0202987C(const UnkStruct_02029894 *param0);
 int sub_02029884(const UnkStruct_02029894 *param0);
 BOOL sub_0202988C(const UnkStruct_02029894 *param0);
-UnkStruct_02029894 *sub_02029894(SaveData *param0);
-SecretBaseRecord *SaveData_SecretBaseRecord(SaveData *param0);
+UnkStruct_02029894 *sub_02029894(SaveData *saveData);
+SecretBaseRecord *SaveData_SecretBaseRecord(SaveData *saveData);
 SecretBaseRecord *sub_020298AC(UnkStruct_02029894 *param0);
 UndergroundData *sub_020298B0(SaveData *param0);
 
diff --git a/include/unk_020298BC.h b/include/unk_020298BC.h
index c6eaf0551a..7fb9e85f14 100644
--- a/include/unk_020298BC.h
+++ b/include/unk_020298BC.h
@@ -86,7 +86,7 @@ u8 sub_0202A628(const UnkStruct_0202A150 *param0);
 u8 sub_0202A62C(const UnkStruct_0202A150 *param0);
 s8 sub_0202A630(const UnkStruct_0202A150 *param0);
 void sub_0202A6A8(u8 param0, int param1, UnkStruct_0202A750 *param2, const void **param3);
-UnkStruct_0202A750 *sub_0202A750(SaveData *param0);
+UnkStruct_0202A750 *sub_0202A750(SaveData *saveData);
 void sub_0202A75C(const UnkStruct_02029C68 *param0, UnkStruct_ov61_0222AE80 *param1);
 void sub_0202A824(const UnkStruct_ov61_0222AE80 *param0, UnkStruct_02029C68 *param1);
 
diff --git a/include/unk_0202C7FC.h b/include/unk_0202C7FC.h
index 12cb77490d..2c8daa9f7b 100644
--- a/include/unk_0202C7FC.h
+++ b/include/unk_0202C7FC.h
@@ -8,7 +8,7 @@
 
 int TrainerCard_SaveSize(void);
 void TrainerCard_Init(UnkStruct_0202C834 *param0);
-UnkStruct_0202C834 *sub_0202C834(SaveData *param0);
+UnkStruct_0202C834 *sub_0202C834(SaveData *saveData);
 u8 *sub_0202C840(UnkStruct_0202C834 *param0);
 UnkStruct_0202C844 *sub_0202C844(UnkStruct_0202C834 *param0);
 int sub_0202C848(const u8 param0, UnkStruct_0202C844 *param1);
diff --git a/include/unk_0202C858.h b/include/unk_0202C858.h
index 3dc19dc7f7..0a6f634938 100644
--- a/include/unk_0202C858.h
+++ b/include/unk_0202C858.h
@@ -7,7 +7,7 @@
 
 int WiFiHistory_SaveSize(void);
 void WiFiHistory_Init(UnkStruct_0202C878 *param0);
-UnkStruct_0202C878 *sub_0202C878(SaveData *param0);
+UnkStruct_0202C878 *sub_0202C878(SaveData *saveData);
 void sub_0202C88C(UnkStruct_0202C878 *param0, int param1, int param2);
 int sub_0202C8C0(const UnkStruct_0202C878 *param0);
 int sub_0202C8C4(const UnkStruct_0202C878 *param0);
diff --git a/include/unk_0202CC64.h b/include/unk_0202CC64.h
index 648f5c53a6..429d2c9873 100644
--- a/include/unk_0202CC64.h
+++ b/include/unk_0202CC64.h
@@ -8,7 +8,7 @@
 int ChatotCry_SaveSize(void);
 void ChatotCry_Init(ChatotCry *param0);
 ChatotCry *ChatotCry_New(int heapID);
-ChatotCry *SaveData_GetChatotCry(SaveData *param0);
+ChatotCry *SaveData_GetChatotCry(SaveData *saveData);
 BOOL IsChatotCryDataValid(const ChatotCry *param0);
 void ResetChatotCryDataStatus(ChatotCry *param0);
 const void *GetChatotCryAudioBuffer(const ChatotCry *param0);
diff --git a/include/unk_0202D05C.h b/include/unk_0202D05C.h
index 87d55718b1..22954a109f 100644
--- a/include/unk_0202D05C.h
+++ b/include/unk_0202D05C.h
@@ -43,7 +43,7 @@ BOOL sub_0202D414(UnkStruct_0202D750 *param0, u16 param1, int param2);
 void sub_0202D470(UnkStruct_0202D750 *param0, u32 param1);
 u32 sub_0202D474(UnkStruct_0202D750 *param0);
 void sub_0202D478(SaveData *param0, int param1, Sentence *param2);
-Sentence *sub_0202D498(SaveData *param0, int param1);
+Sentence *sub_0202D498(SaveData *saveData, int param1);
 void sub_0202D4B0(UnkStruct_0202D764 *param0, u8 param1, u8 param2, RTCDate *param3);
 void sub_0202D514(UnkStruct_0202D764 *param0);
 BOOL sub_0202D558(UnkStruct_0202D764 *param0, u8 param1, u8 param2, RTCDate *param3);
@@ -55,8 +55,8 @@ void sub_0202D63C(UnkStruct_0202D764 *param0, UnkStruct_ov104_0223A348 *param1,
 void sub_0202D6DC(UnkStruct_0202D764 *param0, UnkStruct_ov96_0223B450_sub2 *param1, u8 param2, u8 param3);
 void sub_0202D708(UnkStruct_0202D764 *param0, UnkStruct_02049A68 *param1);
 UnkStruct_ov90_021D1750 *sub_0202D71C(UnkStruct_0202D764 *, int heapID);
-UnkStruct_0202D060 *sub_0202D740(SaveData *param0);
-UnkStruct_0202D750 *sub_0202D750(SaveData *param0);
-UnkStruct_0202D764 *sub_0202D764(SaveData *param0);
+UnkStruct_0202D060 *sub_0202D740(SaveData *saveData);
+UnkStruct_0202D750 *sub_0202D750(SaveData *saveData);
+UnkStruct_0202D764 *sub_0202D764(SaveData *saveData);
 
 #endif // POKEPLATINUM_UNK_0202D05C_H
diff --git a/include/unk_0202D778.h b/include/unk_0202D778.h
index 7df7802956..49eaeefb34 100644
--- a/include/unk_0202D778.h
+++ b/include/unk_0202D778.h
@@ -5,6 +5,6 @@
 
 int Ribbons_SaveSize(void);
 void Ribbons_Init(u8 *param0);
-u8 *sub_0202D79C(SaveData *param0);
+u8 *sub_0202D79C(SaveData *saveData);
 
 #endif // POKEPLATINUM_UNK_0202D778_H
diff --git a/include/unk_0202DA40.h b/include/unk_0202DA40.h
index 1b8c199ff2..53ee9463f1 100644
--- a/include/unk_0202DA40.h
+++ b/include/unk_0202DA40.h
@@ -6,7 +6,7 @@
 #include "pokemon.h"
 #include "savedata.h"
 
-UnkStruct_0202DA40 *sub_0202DA40(SaveData *param0);
+UnkStruct_0202DA40 *sub_0202DA40(SaveData *saveData);
 int GlobalTrade_SaveSize(void);
 void GlobalTrade_Init(UnkStruct_0202DA40 *param0);
 int sub_0202DA60(UnkStruct_0202DA40 *param0);
diff --git a/include/unk_0202E840.h b/include/unk_0202E840.h
index e3b3d50e96..dbe946c3b4 100644
--- a/include/unk_0202E840.h
+++ b/include/unk_0202E840.h
@@ -13,7 +13,7 @@ void sub_0202E858(UnkStruct_0202E858 *param0);
 BOOL sub_0202E870(UnkStruct_0202E858 *param0);
 int Rankings_SaveSize(void);
 void Rankings_Init(UnkStruct_0202E8C0 *param0);
-UnkStruct_0202E8C0 *sub_0202E8C0(SaveData *param0);
+UnkStruct_0202E8C0 *sub_0202E8C0(SaveData *saveData);
 void sub_0202E8D4(UnkStruct_0202E8C0 *param0, int param1, u8 param2);
 int sub_0202E91C(void);
 void *sub_0202E9FC(SaveData *param0, int param1);
diff --git a/include/unk_0202F108.h b/include/unk_0202F108.h
index 055be530c6..192ce7b467 100644
--- a/include/unk_0202F108.h
+++ b/include/unk_0202F108.h
@@ -7,7 +7,7 @@
 
 int Contest_SaveSize(void);
 void Contest_Init(UnkStruct_0202F10C *param0);
-void sub_0202F134(SaveData *param0, int param1, int param2);
-u16 sub_0202F160(SaveData *param0, int param1, int param2);
+void sub_0202F134(SaveData *saveData, int param1, int param2);
+u16 sub_0202F160(SaveData *saveData, int param1, int param2);
 
 #endif // POKEPLATINUM_UNK_0202F108_H
diff --git a/include/unk_0202FF4C.h b/include/unk_0202FF4C.h
index 9254c9b63b..90942a36db 100644
--- a/include/unk_0202FF4C.h
+++ b/include/unk_0202FF4C.h
@@ -7,7 +7,7 @@
 #include "savedata.h"
 
 void sub_0202FF4C(UnkStruct_0202FF58 *param0);
-UnkStruct_0202FF58 *sub_0202FF58(SaveData *param0);
+UnkStruct_0202FF58 *sub_0202FF58(SaveData *saveData);
 BOOL sub_0202FF68(UnkStruct_0202FF58 *param0);
 void sub_0202FF70(UnkStruct_0202FF58 *param0, BOOL param1);
 void sub_0202FF84(UnkStruct_0202FF58 *param0, u8 param1, u8 param2, const void *param3);
@@ -15,6 +15,6 @@ u32 sub_02030030(UnkStruct_0202FF58 *param0, u8 param1, u8 param2, void *param3)
 void sub_020300A4(UnkStruct_020300F4 *param0);
 void sub_020300B0(UnkStruct_020300F4 *param0, u8 param1, u8 param2, const void *param3);
 u32 sub_020300E0(UnkStruct_020300F4 *param0, u8 param1, u8 param2, void *param3);
-UnkStruct_020300F4 *sub_020300F4(SaveData *param0);
+UnkStruct_020300F4 *sub_020300F4(SaveData *saveData);
 
 #endif // POKEPLATINUM_UNK_0202FF4C_H
diff --git a/include/unk_02030108.h b/include/unk_02030108.h
index 2d3097e07b..53bc09d7b7 100644
--- a/include/unk_02030108.h
+++ b/include/unk_02030108.h
@@ -7,7 +7,7 @@
 #include "savedata.h"
 
 void sub_02030108(UnkStruct_02030114 *param0);
-UnkStruct_02030114 *sub_02030114(SaveData *param0);
+UnkStruct_02030114 *sub_02030114(SaveData *saveData);
 BOOL sub_02030124(UnkStruct_02030114 *param0);
 void sub_0203012C(UnkStruct_02030114 *param0, BOOL param1);
 void sub_02030140(UnkStruct_02030114 *param0, u8 param1, u8 param2, u8 param3, const void *param4);
@@ -16,7 +16,7 @@ u8 sub_020301E0(u8 param0, u8 *param1);
 void sub_02030204(u8 param0, u8 *param1, u8 param2);
 void sub_02030244(u8 *param0);
 void sub_02030260(UnkStruct_0203026C *param0);
-UnkStruct_0203026C *sub_0203026C(SaveData *param0);
+UnkStruct_0203026C *sub_0203026C(SaveData *saveData);
 void sub_02030280(UnkStruct_0203026C *param0, u8 param1, u8 param2, u8 param3, const void *param4);
 u32 sub_020302B4(UnkStruct_0203026C *param0, u8 param1, u8 param2, u8 param3, void *param4);
 
diff --git a/include/unk_020302D0.h b/include/unk_020302D0.h
index 5bd8cb37ae..cb8e7fb2ee 100644
--- a/include/unk_020302D0.h
+++ b/include/unk_020302D0.h
@@ -7,13 +7,13 @@
 #include "savedata.h"
 
 void sub_020302D0(UnkStruct_020302DC *param0);
-UnkStruct_020302DC *sub_020302DC(SaveData *param0);
+UnkStruct_020302DC *sub_020302DC(SaveData *saveData);
 BOOL sub_020302EC(UnkStruct_020302DC *param0);
 void sub_020302F4(UnkStruct_020302DC *param0, BOOL param1);
 void sub_02030308(UnkStruct_020302DC *param0, u8 param1, u8 param2, u8 param3, const void *param4);
 u32 sub_02030398(UnkStruct_020302DC *param0, u8 param1, u8 param2, u8 param3, void *param4);
 void sub_02030410(UnkStruct_0203041C *param0);
-UnkStruct_0203041C *sub_0203041C(SaveData *param0);
+UnkStruct_0203041C *sub_0203041C(SaveData *saveData);
 void sub_02030430(UnkStruct_0203041C *param0, u8 param1, u8 param2, u8 param3, const void *param4);
 u32 sub_02030470(UnkStruct_0203041C *param0, u8 param1, u8 param2, u8 param3, void *param4);
 
diff --git a/include/unk_02030494.h b/include/unk_02030494.h
index 01b4edd417..e1744c4e66 100644
--- a/include/unk_02030494.h
+++ b/include/unk_02030494.h
@@ -7,13 +7,13 @@
 #include "savedata.h"
 
 void sub_02030494(UnkStruct_020304A0 *param0);
-UnkStruct_020304A0 *sub_020304A0(SaveData *param0);
+UnkStruct_020304A0 *sub_020304A0(SaveData *saveData);
 BOOL sub_020304B0(UnkStruct_020304A0 *param0);
 void sub_020304B8(UnkStruct_020304A0 *param0, BOOL param1);
 void sub_020304CC(UnkStruct_020304A0 *param0, u8 param1, u8 param2, u8 param3, const void *param4);
 u32 sub_0203054C(UnkStruct_020304A0 *param0, u8 param1, u8 param2, u8 param3, void *param4);
 void sub_020305AC(UnkStruct_020305B8 *param0);
-UnkStruct_020305B8 *sub_020305B8(SaveData *param0);
+UnkStruct_020305B8 *sub_020305B8(SaveData *saveData);
 void sub_020305CC(UnkStruct_020305B8 *param0, u8 param1, u8 param2, u8 param3, const void *param4);
 u32 sub_02030600(UnkStruct_020305B8 *param0, u8 param1, u8 param2, u8 param3, void *param4);
 
diff --git a/include/unk_0203061C.h b/include/unk_0203061C.h
index 3fbc781baf..9e7a941042 100644
--- a/include/unk_0203061C.h
+++ b/include/unk_0203061C.h
@@ -7,7 +7,7 @@
 
 int Frontier_SaveSize(void);
 void Frontier_Init(UnkStruct_0203068C *param0);
-UnkStruct_0203068C *sub_0203068C(SaveData *param0);
+UnkStruct_0203068C *sub_0203068C(SaveData *saveData);
 u16 sub_02030698(UnkStruct_0203068C *param0, int param1, int param2);
 u16 sub_020306E4(UnkStruct_0203068C *param0, int param1, int param2, u16 param3);
 void sub_02030764(UnkStruct_0203068C *param0);
diff --git a/include/unk_02030CE8.h b/include/unk_02030CE8.h
index 37694c97aa..e579f6b773 100644
--- a/include/unk_02030CE8.h
+++ b/include/unk_02030CE8.h
@@ -9,13 +9,13 @@
 
 int Email_SaveSize(void);
 void Email_Init(UnkStruct_02030CEC *param0);
-void sub_02030D10(SaveData *param0);
+void sub_02030D10(SaveData *saveData);
 BOOL sub_02030D20(SaveData *param0);
-void sub_02030D38(SaveData *param0, const char *param1);
-char *sub_02030D50(SaveData *param0);
-void sub_02030D5C(SaveData *param0, int param1, u32 param2);
-u32 sub_02030D98(SaveData *param0, int param1);
+void sub_02030D38(SaveData *saveData, const char *param1);
+char *sub_02030D50(SaveData *saveData);
+void sub_02030D5C(SaveData *saveData, int param1, u32 param2);
+u32 sub_02030D98(SaveData *saveData, int param1);
 u32 sub_02030E48(SaveData *param0, UnkStruct_ov96_0223B574 *param1);
-void sub_02030E78(SaveData *param0, UnkStruct_ov96_0223B574 *param1);
+void sub_02030E78(SaveData *saveData, UnkStruct_ov96_0223B574 *param1);
 
 #endif // POKEPLATINUM_UNK_02030CE8_H
diff --git a/include/unk_02030EA4.h b/include/unk_02030EA4.h
index e6ad8ddd4f..633586a8bf 100644
--- a/include/unk_02030EA4.h
+++ b/include/unk_02030EA4.h
@@ -7,7 +7,7 @@
 
 int WiFiQuestion_SaveSize(void);
 void WiFiQuestion_Init(UnkStruct_02030EC4 *param0);
-UnkStruct_02030EC4 *sub_02030EC4(SaveData *param0);
+UnkStruct_02030EC4 *sub_02030EC4(SaveData *saveData);
 u32 sub_02030ED0(const UnkStruct_02030EC4 *param0);
 u32 sub_02030ED4(const UnkStruct_02030EC4 *param0);
 void sub_02030ED8(UnkStruct_02030EC4 *param0, u32 param1);
diff --git a/src/field_overworld_state.c b/src/field_overworld_state.c
index 1e0d36b3fd..b960327363 100644
--- a/src/field_overworld_state.c
+++ b/src/field_overworld_state.c
@@ -156,13 +156,13 @@ u16 *FieldOverworldState_GetPoisonStepCount(FieldOverworldState *fieldState)
 
 FieldOverworldState *SaveData_GetFieldOverworldState(SaveData *saveData)
 {
-    FieldOverworldState *fieldState = SaveData_SaveTable(saveData, 6);
+    FieldOverworldState *fieldState = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FIELD_PLAYER_STATE);
     return fieldState;
 }
 
 FieldOverworldSave *SaveData_GetFieldOverworldSave(SaveData *saveData)
 {
-    FieldOverworldSave *fieldSave = SaveData_SaveTable(saveData, 11);
+    FieldOverworldSave *fieldSave = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FIELD_OVERWORLD_STATE);
     return fieldSave;
 }
 
diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c
index ecdfe14a86..a6d25b80a4 100644
--- a/src/overlay065/ov65_0222DCE0.c
+++ b/src/overlay065/ov65_0222DCE0.c
@@ -1729,7 +1729,7 @@ static int ov65_0222F304(UnkStruct_ov65_0222EBE0 *param0, int param1)
 
         if (v1 == 0) {
             WiFiList_Init(param0->unk_00);
-            Email_Init(SaveData_SaveTable(param0->saveData, 35));
+            Email_Init(SaveData_SaveTable(param0->saveData, SAVE_TABLE_ENTRY_EMAIL));
             sub_02030764(sub_0203068C(param0->saveData));
             param0->unk_3A8 = 14;
             param0->unk_04 = sub_0203871C(param0->saveData, sizeof(UnkStruct_0207DFAC));
diff --git a/src/savedata/save_table.c b/src/savedata/save_table.c
index 5f01b1d342..73263c1900 100644
--- a/src/savedata/save_table.c
+++ b/src/savedata/save_table.c
@@ -88,26 +88,26 @@ const SaveTableEntry gSaveTable[] = {
 
 const int gSaveTableSize = NELEMS(gSaveTable);
 
-TVBroadcast *SaveData_GetTVBroadcast(SaveData *save)
+TVBroadcast *SaveData_GetTVBroadcast(SaveData *saveData)
 {
     SaveData_Checksum(SAVE_TABLE_ENTRY_TV_BROADCAST);
-    return SaveData_SaveTable(save, SAVE_TABLE_ENTRY_TV_BROADCAST);
+    return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_TV_BROADCAST);
 }
 
-PCBoxes *SaveData_GetPCBoxes(SaveData *save)
+PCBoxes *SaveData_GetPCBoxes(SaveData *saveData)
 {
-    return SaveData_SaveTable(save, SAVE_TABLE_ENTRY_PC_BOXES);
+    return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_PC_BOXES);
 }
 
-MysteryGift *SaveData_GetMysteryGift(SaveData *save)
+MysteryGift *SaveData_GetMysteryGift(SaveData *saveData)
 {
     SaveData_Checksum(SAVE_TABLE_ENTRY_MYSTERY_GIFT);
-    return SaveData_SaveTable(save, SAVE_TABLE_ENTRY_MYSTERY_GIFT);
+    return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_MYSTERY_GIFT);
 }
 
-PalParkTransfer *SaveData_GetPalParkTransfer(SaveData *save)
+PalParkTransfer *SaveData_GetPalParkTransfer(SaveData *saveData)
 {
-    return SaveData_SaveTable(save, SAVE_TABLE_ENTRY_PAL_PARK_TRANSFER);
+    return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_PAL_PARK_TRANSFER);
 }
 
 const SaveTableEntry gExtraSaveTable[] = {
@@ -121,34 +121,34 @@ const SaveTableEntry gExtraSaveTable[] = {
 
 const int gExtraSaveTableSize = NELEMS(gExtraSaveTable);
 
-HallOfFame *SaveData_HallOfFame(SaveData *save, int heapID, int *resultCode)
+HallOfFame *SaveData_HallOfFame(SaveData *saveData, int heapID, int *resultCode)
 {
-    return SaveDataExtra_Get(save, heapID, EXTRA_SAVE_TABLE_ENTRY_HALL_OF_FAME, resultCode);
+    return SaveDataExtra_Get(saveData, heapID, EXTRA_SAVE_TABLE_ENTRY_HALL_OF_FAME, resultCode);
 }
 
-int SaveData_SaveHallOfFame(SaveData *save, HallOfFame *hof)
+int SaveData_SaveHallOfFame(SaveData *saveData, HallOfFame *hof)
 {
-    return SaveDataExtra_Save(save, EXTRA_SAVE_TABLE_ENTRY_HALL_OF_FAME, hof);
+    return SaveDataExtra_Save(saveData, EXTRA_SAVE_TABLE_ENTRY_HALL_OF_FAME, hof);
 }
 
-BattleRecording *SaveData_BattleRecording(SaveData *save, int heapID, int *resultCode, int recNum)
+BattleRecording *SaveData_BattleRecording(SaveData *saveData, int heapID, int *resultCode, int recNum)
 {
     BOOL tmp;
-    return SaveDataExtra_Mirror(save, heapID, EXTRA_SAVE_TABLE_ENTRY_MY_RECORDINGS + recNum, resultCode, &tmp);
+    return SaveDataExtra_Mirror(saveData, heapID, EXTRA_SAVE_TABLE_ENTRY_MY_RECORDINGS + recNum, resultCode, &tmp);
 }
 
-int SaveData_SaveBattleRecording(SaveData *save, BattleRecording *rec, int recNum)
+int SaveData_SaveBattleRecording(SaveData *saveData, BattleRecording *rec, int recNum)
 {
-    return SaveDataExtra_SaveMirror(save, EXTRA_SAVE_TABLE_ENTRY_MY_RECORDINGS + recNum, rec);
+    return SaveDataExtra_SaveMirror(saveData, EXTRA_SAVE_TABLE_ENTRY_MY_RECORDINGS + recNum, rec);
 }
 
-BattleFrontierStage *SaveData_BattleFrontierStage(SaveData *save, int heapID, int *resultCode)
+BattleFrontierStage *SaveData_BattleFrontierStage(SaveData *saveData, int heapID, int *resultCode)
 {
     BOOL tmp;
-    return SaveDataExtra_Mirror(save, heapID, EXTRA_SAVE_TABLE_ENTRY_FRONTIER, resultCode, &tmp);
+    return SaveDataExtra_Mirror(saveData, heapID, EXTRA_SAVE_TABLE_ENTRY_FRONTIER, resultCode, &tmp);
 }
 
-int SaveData_SaveBattleFrontierStage(SaveData *save, BattleFrontierStage *frontier)
+int SaveData_SaveBattleFrontierStage(SaveData *saveData, BattleFrontierStage *frontier)
 {
-    return SaveDataExtra_SaveMirror(save, EXTRA_SAVE_TABLE_ENTRY_FRONTIER, frontier);
+    return SaveDataExtra_SaveMirror(saveData, EXTRA_SAVE_TABLE_ENTRY_FRONTIER, frontier);
 }
diff --git a/src/special_encounter.c b/src/special_encounter.c
index b1acbe2168..07b893fe8e 100644
--- a/src/special_encounter.c
+++ b/src/special_encounter.c
@@ -68,9 +68,9 @@ RadarChainRecords *SpecialEncounter_GetRadarChainRecords(SpecialEncounter *speEn
     return &(speEnc->chainRecords);
 }
 
-SpecialEncounter *SaveData_GetSpecialEncounters(SaveData *speEnc)
+SpecialEncounter *SaveData_GetSpecialEncounters(SaveData *saveData)
 {
-    return SaveData_SaveTable(speEnc, SAVE_TABLE_ENTRY_ENCOUNTERS);
+    return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_ENCOUNTERS);
 }
 
 // This is exclusively used in combination with SpecialEncounter_GetHoneyTree, so they could've just been one function...
@@ -97,14 +97,14 @@ HoneyTree *SpecialEncounter_GetHoneyTree(const u8 treeId, PlayerHoneyTreeStates
 }
 
 // These are minute timers. They start at 24 hours'worth of minutes
-void SpecialEncounter_DecrementHoneyTreeTimers(SaveData *save, const int decrement)
+void SpecialEncounter_DecrementHoneyTreeTimers(SaveData *saveData, const int decrement)
 {
     int i;
     PlayerHoneyTreeStates *treeDat;
     SpecialEncounter *speEnc;
     HoneyTree *tree;
 
-    speEnc = SaveData_GetSpecialEncounters(save);
+    speEnc = SaveData_GetSpecialEncounters(saveData);
     treeDat = &(speEnc->treeStates);
 
     for (i = 0; i < NUM_HONEY_TREES; i++) {
diff --git a/src/system_data.c b/src/system_data.c
index 44d82e6b47..8b13b0dbb2 100644
--- a/src/system_data.c
+++ b/src/system_data.c
@@ -16,9 +16,9 @@ void SystemData_Clear(SystemData *systemData)
     GameTime_Clear(&systemData->gameTime);
 }
 
-SystemData *SaveData_GetSystemData(SaveData *systemData)
+SystemData *SaveData_GetSystemData(SaveData *saveData)
 {
-    return SaveData_SaveTable(systemData, SAVE_TABLE_ENTRY_SYSTEM);
+    return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_SYSTEM);
 }
 
 GameTime *SaveData_GetGameTime(SaveData *saveData)
diff --git a/src/unk_02014D38.c b/src/unk_02014D38.c
index fcc22291a9..7de6662e05 100644
--- a/src/unk_02014D38.c
+++ b/src/unk_02014D38.c
@@ -260,10 +260,10 @@ void Sentence_Init(void *param0)
     SaveData_SetChecksum(34);
 }
 
-UnkStruct_02014EC4 *sub_02014EC4(SaveData *param0)
+UnkStruct_02014EC4 *sub_02014EC4(SaveData *saveData)
 {
-    SaveData_Checksum(34);
-    return SaveData_SaveTable(param0, 34);
+    SaveData_Checksum(SAVE_TABLE_ENTRY_SENTENCE);
+    return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_SENTENCE);
 }
 
 BOOL sub_02014ED8(const UnkStruct_02014EC4 *param0, u32 param1)
diff --git a/src/unk_0202602C.c b/src/unk_0202602C.c
index be662ce681..0bff205a7b 100644
--- a/src/unk_0202602C.c
+++ b/src/unk_0202602C.c
@@ -97,12 +97,10 @@ int sub_02026074(const BattleRegulation *param0, int param1)
     return v0;
 }
 
-BattleRegulation *sub_0202610C(SaveData *param0, int param1)
+BattleRegulation *sub_0202610C(SaveData *saveData, int param1)
 {
-    UnkStruct_02026030 *v0 = NULL;
-
     GF_ASSERT(param1 < 1);
-    v0 = SaveData_SaveTable(param0, 13);
+    UnkStruct_02026030 *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_REGULATION_BATTLES);
 
     if (sub_02026074(&v0->unk_00[param1], 1) != 0) {
         return &v0->unk_00[param1];
@@ -111,10 +109,8 @@ BattleRegulation *sub_0202610C(SaveData *param0, int param1)
     return NULL;
 }
 
-void sub_0202613C(SaveData *param0, const BattleRegulation *param1)
+void sub_0202613C(SaveData *saveData, const BattleRegulation *param1)
 {
-    UnkStruct_02026030 *v0 = NULL;
-
-    v0 = SaveData_SaveTable(param0, 13);
+    UnkStruct_02026030 *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_REGULATION_BATTLES);
     BattleRegulation_Copy(param1, &v0->unk_00[0]);
 }
diff --git a/src/unk_02026150.c b/src/unk_02026150.c
index 99777f0339..4d6d3e9fa2 100644
--- a/src/unk_02026150.c
+++ b/src/unk_02026150.c
@@ -94,7 +94,7 @@ BattleRegulation Unk_02100860 = {
     0x0,
 };
 
-const BattleRegulation *sub_02026150(SaveData *param0, int param1)
+const BattleRegulation *sub_02026150(SaveData *saveData, int param1)
 {
     UnkStruct_02026030 *v0 = NULL;
 
@@ -102,7 +102,7 @@ const BattleRegulation *sub_02026150(SaveData *param0, int param1)
         return &Unk_02100880[param1];
     }
 
-    v0 = SaveData_SaveTable(param0, 13);
+    v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_REGULATION_BATTLES);
     return &v0->unk_00[0];
 }
 
diff --git a/src/unk_02027F84.c b/src/unk_02027F84.c
index 9efc672bcf..a4c85e39cf 100644
--- a/src/unk_02027F84.c
+++ b/src/unk_02027F84.c
@@ -14,9 +14,9 @@ int PalPad_SaveSize(void)
     return sizeof(UnkStruct_02027F8C) * 16;
 }
 
-UnkStruct_02027F8C *sub_02027F8C(SaveData *param0)
+UnkStruct_02027F8C *sub_02027F8C(SaveData *saveData)
 {
-    return SaveData_SaveTable(param0, 9);
+    return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_PAL_PAD);
 }
 
 void PalPad_Init(UnkStruct_02027F8C *param0)
diff --git a/src/unk_02028124.c b/src/unk_02028124.c
index 26b617dff3..11278f3c66 100644
--- a/src/unk_02028124.c
+++ b/src/unk_02028124.c
@@ -230,9 +230,9 @@ void sub_0202841C(Mail *param0, Sentence *param1, u8 param2)
     sub_02014CC0(&param0->unk_20[param2], param1);
 }
 
-UnkStruct_02028430 *sub_02028430(SaveData *param0)
+UnkStruct_02028430 *sub_02028430(SaveData *saveData)
 {
-    return SaveData_SaveTable(param0, 15);
+    return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_MAIL);
 }
 
 int Mail_SaveSize(void)
diff --git a/src/unk_0202854C.c b/src/unk_0202854C.c
index 3b6498c1a4..e5cc92d56a 100644
--- a/src/unk_0202854C.c
+++ b/src/unk_0202854C.c
@@ -1356,15 +1356,15 @@ BOOL sub_0202988C(const UnkStruct_02029894 *param0)
     return param0->unk_91;
 }
 
-UnkStruct_02029894 *sub_02029894(SaveData *param0)
+UnkStruct_02029894 *sub_02029894(SaveData *saveData)
 {
-    UndergroundData *v0 = SaveData_SaveTable(param0, 12);
+    UndergroundData *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_UNDERGROUND);
     return &v0->unk_00;
 }
 
-SecretBaseRecord *SaveData_SecretBaseRecord(SaveData *param0)
+SecretBaseRecord *SaveData_SecretBaseRecord(SaveData *saveData)
 {
-    UndergroundData *v0 = SaveData_SaveTable(param0, 12);
+    UndergroundData *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_UNDERGROUND);
     return &v0->unk_00.unk_50;
 }
 
@@ -1373,8 +1373,7 @@ SecretBaseRecord *sub_020298AC(UnkStruct_02029894 *param0)
     return &param0->unk_50;
 }
 
-UndergroundData *sub_020298B0(SaveData *param0)
+UndergroundData *sub_020298B0(SaveData *saveData)
 {
-    UndergroundData *v0 = SaveData_SaveTable(param0, 12);
-    return v0;
+    return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_UNDERGROUND);
 }
diff --git a/src/unk_020298BC.c b/src/unk_020298BC.c
index 6665ba063a..0f5d4892ae 100644
--- a/src/unk_020298BC.c
+++ b/src/unk_020298BC.c
@@ -971,12 +971,9 @@ void sub_0202A6A8(u8 param0, int param1, UnkStruct_0202A750 *param2, const void
     }
 }
 
-UnkStruct_0202A750 *sub_0202A750(SaveData *param0)
+UnkStruct_0202A750 *sub_0202A750(SaveData *saveData)
 {
-    UnkStruct_0202A750 *v0 = NULL;
-
-    v0 = SaveData_SaveTable(param0, 14);
-    return v0;
+    return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_IMAGE_CLIPS);
 }
 
 void sub_0202A75C(const UnkStruct_02029C68 *param0, UnkStruct_ov61_0222AE80 *param1)
diff --git a/src/unk_0202ACE0.c b/src/unk_0202ACE0.c
index 1418ca18fc..ee08ebb9f1 100644
--- a/src/unk_0202ACE0.c
+++ b/src/unk_0202ACE0.c
@@ -376,6 +376,5 @@ void sub_0202B270(UnkStruct_0202B370 *param0, int param1, int param2)
 
 UnkStruct_0202B370 *sub_0202B370(SaveData *saveData)
 {
-    UnkStruct_0202B370 *v0 = SaveData_SaveTable(saveData, 29);
-    return v0;
+    return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_WIFI_LIST);
 }
diff --git a/src/unk_0202C7FC.c b/src/unk_0202C7FC.c
index 1c43b3fa12..effeba898e 100644
--- a/src/unk_0202C7FC.c
+++ b/src/unk_0202C7FC.c
@@ -35,9 +35,9 @@ void TrainerCard_Init(UnkStruct_0202C834 *param0)
     }
 }
 
-UnkStruct_0202C834 *sub_0202C834(SaveData *param0)
+UnkStruct_0202C834 *sub_0202C834(SaveData *saveData)
 {
-    return SaveData_SaveTable(param0, 19);
+    return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_TRAINER_CARD);
 }
 
 u8 *sub_0202C840(UnkStruct_0202C834 *param0)
diff --git a/src/unk_0202C858.c b/src/unk_0202C858.c
index 68b2d1ccd1..1673409d22 100644
--- a/src/unk_0202C858.c
+++ b/src/unk_0202C858.c
@@ -18,10 +18,10 @@ void WiFiHistory_Init(UnkStruct_0202C878 *param0)
     SaveData_SetChecksum(30);
 }
 
-UnkStruct_0202C878 *sub_0202C878(SaveData *param0)
+UnkStruct_0202C878 *sub_0202C878(SaveData *saveData)
 {
     SaveData_Checksum(30);
-    return (UnkStruct_0202C878 *)SaveData_SaveTable(param0, 30);
+    return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_WIFI_HISTORY);
 }
 
 void sub_0202C88C(UnkStruct_0202C878 *param0, int param1, int param2)
diff --git a/src/unk_0202C9F4.c b/src/unk_0202C9F4.c
index 3a7df5728a..667dcf8478 100644
--- a/src/unk_0202C9F4.c
+++ b/src/unk_0202C9F4.c
@@ -26,12 +26,9 @@ void sub_0202CA10(const UnkStruct_0202CA28 *param0, UnkStruct_0202CA28 *param1)
     MI_CpuCopy8(param0, param1, sizeof(UnkStruct_0202CA28));
 }
 
-UnkStruct_0202CA1C *sub_0202CA1C(SaveData *param0)
+UnkStruct_0202CA1C *sub_0202CA1C(SaveData *saveData)
 {
-    UnkStruct_0202CA1C *v0 = NULL;
-
-    v0 = SaveData_SaveTable(param0, 21);
-    return v0;
+    return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_BALL_SEALS);
 }
 
 UnkStruct_0202CA28 *sub_0202CA28(UnkStruct_0202CA1C *param0, int param1)
diff --git a/src/unk_0202CC64.c b/src/unk_0202CC64.c
index a977945eb8..0c07dd9c89 100644
--- a/src/unk_0202CC64.c
+++ b/src/unk_0202CC64.c
@@ -27,9 +27,9 @@ ChatotCry *ChatotCry_New(int heapID)
     return cry;
 }
 
-ChatotCry *SaveData_GetChatotCry(SaveData *param0)
+ChatotCry *SaveData_GetChatotCry(SaveData *saveData)
 {
-    return (ChatotCry *)SaveData_SaveTable(param0, 22);
+    return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_CHATOT);
 }
 
 BOOL IsChatotCryDataValid(const ChatotCry *cry)
diff --git a/src/unk_0202D05C.c b/src/unk_0202D05C.c
index 3b2561c53a..3e88030e77 100644
--- a/src/unk_0202D05C.c
+++ b/src/unk_0202D05C.c
@@ -372,15 +372,15 @@ u32 sub_0202D474(UnkStruct_0202D750 *param0)
     return param0->unk_04;
 }
 
-void sub_0202D478(SaveData *param0, int param1, Sentence *param2)
+void sub_0202D478(SaveData *saveData, int param1, Sentence *param2)
 {
-    UnkStruct_0203068C *v0 = SaveData_SaveTable(param0, 23);
+    UnkStruct_0203068C *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
     sub_02014CC0(&(v0->unk_950.unk_168.unk_00[param1]), param2);
 }
 
-Sentence *sub_0202D498(SaveData *param0, int param1)
+Sentence *sub_0202D498(SaveData *saveData, int param1)
 {
-    UnkStruct_0203068C *v0 = SaveData_SaveTable(param0, 23);
+    UnkStruct_0203068C *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
 
     return &(v0->unk_950.unk_168.unk_00[param1]);
 }
@@ -540,20 +540,20 @@ UnkStruct_ov90_021D1750 *sub_0202D71C(UnkStruct_0202D764 *param0, int heapID)
     return v0;
 }
 
-UnkStruct_0202D060 *sub_0202D740(SaveData *param0)
+UnkStruct_0202D060 *sub_0202D740(SaveData *saveData)
 {
-    UnkStruct_0203068C *v0 = SaveData_SaveTable(param0, 23);
+    UnkStruct_0203068C *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
     return &v0->unk_8E0_val1;
 }
 
-UnkStruct_0202D750 *sub_0202D750(SaveData *param0)
+UnkStruct_0202D750 *sub_0202D750(SaveData *saveData)
 {
-    UnkStruct_0203068C *v0 = SaveData_SaveTable(param0, 23);
+    UnkStruct_0203068C *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
     return &v0->unk_950.unk_00;
 }
 
-UnkStruct_0202D764 *sub_0202D764(SaveData *param0)
+UnkStruct_0202D764 *sub_0202D764(SaveData *saveData)
 {
-    UnkStruct_0203068C *v0 = SaveData_SaveTable(param0, 23);
+    UnkStruct_0203068C *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
     return &v0->unk_950.unk_188;
 }
diff --git a/src/unk_0202D778.c b/src/unk_0202D778.c
index 2c37d447f7..321d7b2709 100644
--- a/src/unk_0202D778.c
+++ b/src/unk_0202D778.c
@@ -15,7 +15,7 @@ void Ribbons_Init(u8 *param0)
     memset(param0, 0, 14);
 }
 
-u8 *sub_0202D79C(SaveData *param0)
+u8 *sub_0202D79C(SaveData *saveData)
 {
-    return SaveData_SaveTable(param0, 24);
+    return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_RIBBONS);
 }
diff --git a/src/unk_0202DA40.c b/src/unk_0202DA40.c
index d0ca6cf32a..5bcfe26d1d 100644
--- a/src/unk_0202DA40.c
+++ b/src/unk_0202DA40.c
@@ -14,9 +14,9 @@ typedef struct UnkStruct_0202DA40_t {
     u32 unk_F4;
 } UnkStruct_0202DA40;
 
-UnkStruct_0202DA40 *sub_0202DA40(SaveData *param0)
+UnkStruct_0202DA40 *sub_0202DA40(SaveData *saveData)
 {
-    return SaveData_SaveTable(param0, 26);
+    return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_GLOBAL_TRADE);
 }
 
 int GlobalTrade_SaveSize(void)
diff --git a/src/unk_0202E840.c b/src/unk_0202E840.c
index f907cf9a0e..f6f905a9d2 100644
--- a/src/unk_0202E840.c
+++ b/src/unk_0202E840.c
@@ -85,10 +85,10 @@ void Rankings_Init(UnkStruct_0202E8C0 *param0)
     SaveData_SetChecksum(28);
 }
 
-UnkStruct_0202E8C0 *sub_0202E8C0(SaveData *param0)
+UnkStruct_0202E8C0 *sub_0202E8C0(SaveData *saveData)
 {
     SaveData_Checksum(28);
-    return SaveData_SaveTable(param0, 28);
+    return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_RANKINGS);
 }
 
 void sub_0202E8D4(UnkStruct_0202E8C0 *param0, int param1, u8 param2)
diff --git a/src/unk_0202F108.c b/src/unk_0202F108.c
index f84f2191aa..433cc9064b 100644
--- a/src/unk_0202F108.c
+++ b/src/unk_0202F108.c
@@ -25,9 +25,9 @@ void Contest_Init(UnkStruct_0202F10C *param0)
     SaveData_SetChecksum(33);
 }
 
-void sub_0202F134(SaveData *param0, int param1, int param2)
+void sub_0202F134(SaveData *saveData, int param1, int param2)
 {
-    UnkStruct_0202F10C *v0 = SaveData_SaveTable(param0, 33);
+    UnkStruct_0202F10C *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_CONTESTS);
 
     if (v0->unk_00[param1][param2] < 9999) {
         v0->unk_00[param1][param2]++;
@@ -36,9 +36,9 @@ void sub_0202F134(SaveData *param0, int param1, int param2)
     SaveData_SetChecksum(33);
 }
 
-u16 sub_0202F160(SaveData *param0, int param1, int param2)
+u16 sub_0202F160(SaveData *saveData, int param1, int param2)
 {
-    UnkStruct_0202F10C *v0 = SaveData_SaveTable(param0, 33);
+    UnkStruct_0202F10C *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_CONTESTS);
     SaveData_Checksum(33);
 
     return v0->unk_00[param1][param2];
diff --git a/src/unk_0202FF4C.c b/src/unk_0202FF4C.c
index d1af35e8f4..d19957f1d1 100644
--- a/src/unk_0202FF4C.c
+++ b/src/unk_0202FF4C.c
@@ -10,11 +10,9 @@
 #include "savedata.h"
 
 void sub_0202FF4C(UnkStruct_0202FF58 *param0);
-UnkStruct_0202FF58 *sub_0202FF58(SaveData *param0);
 void sub_020300A4(UnkStruct_020300F4 *param0);
 void sub_020300B0(UnkStruct_020300F4 *param0, u8 param1, u8 param2, const void *param3);
 u32 sub_020300E0(UnkStruct_020300F4 *param0, u8 param1, u8 param2, void *param3);
-UnkStruct_020300F4 *sub_020300F4(SaveData *param0);
 BOOL sub_0202FF68(UnkStruct_0202FF58 *param0);
 void sub_0202FF70(UnkStruct_0202FF58 *param0, BOOL param1);
 void sub_0202FF84(UnkStruct_0202FF58 *param0, u8 param1, u8 param2, const void *param3);
@@ -26,9 +24,9 @@ void sub_0202FF4C(UnkStruct_0202FF58 *param0)
     return;
 }
 
-UnkStruct_0202FF58 *sub_0202FF58(SaveData *param0)
+UnkStruct_0202FF58 *sub_0202FF58(SaveData *saveData)
 {
-    UnkStruct_0203068C *v0 = SaveData_SaveTable(param0, 23);
+    UnkStruct_0203068C *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
     return &v0->unk_8E0_val2;
 }
 
@@ -148,8 +146,8 @@ u32 sub_020300E0(UnkStruct_020300F4 *param0, u8 param1, u8 param2, void *param3)
     return 0;
 }
 
-UnkStruct_020300F4 *sub_020300F4(SaveData *param0)
+UnkStruct_020300F4 *sub_020300F4(SaveData *saveData)
 {
-    UnkStruct_0203068C *v0 = SaveData_SaveTable(param0, 23);
+    UnkStruct_0203068C *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
     return &v0->unk_1614.unk_00;
 }
diff --git a/src/unk_02030108.c b/src/unk_02030108.c
index f0f6786581..4d54507cfc 100644
--- a/src/unk_02030108.c
+++ b/src/unk_02030108.c
@@ -10,7 +10,6 @@
 #include "savedata.h"
 
 void sub_02030108(UnkStruct_02030114 *param0);
-UnkStruct_02030114 *sub_02030114(SaveData *param0);
 BOOL sub_02030124(UnkStruct_02030114 *param0);
 void sub_0203012C(UnkStruct_02030114 *param0, BOOL param1);
 void sub_02030140(UnkStruct_02030114 *param0, u8 param1, u8 param2, u8 param3, const void *param4);
@@ -19,7 +18,6 @@ u8 sub_020301E0(u8 param0, u8 *param1);
 void sub_02030204(u8 param0, u8 *param1, u8 param2);
 void sub_02030244(u8 *param0);
 void sub_02030260(UnkStruct_0203026C *param0);
-UnkStruct_0203026C *sub_0203026C(SaveData *param0);
 void sub_02030280(UnkStruct_0203026C *param0, u8 param1, u8 param2, u8 param3, const void *param4);
 u32 sub_020302B4(UnkStruct_0203026C *param0, u8 param1, u8 param2, u8 param3, void *param4);
 
@@ -29,9 +27,9 @@ void sub_02030108(UnkStruct_02030114 *param0)
     return;
 }
 
-UnkStruct_02030114 *sub_02030114(SaveData *param0)
+UnkStruct_02030114 *sub_02030114(SaveData *saveData)
 {
-    UnkStruct_0203068C *v0 = SaveData_SaveTable(param0, 23);
+    UnkStruct_0203068C *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
     return &v0->unk_8E0_val3;
 }
 
@@ -148,9 +146,9 @@ void sub_02030260(UnkStruct_0203026C *param0)
     return;
 }
 
-UnkStruct_0203026C *sub_0203026C(SaveData *param0)
+UnkStruct_0203026C *sub_0203026C(SaveData *saveData)
 {
-    UnkStruct_0203068C *v0 = SaveData_SaveTable(param0, 23);
+    UnkStruct_0203068C *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
     return &v0->unk_1618.unk_00;
 }
 
diff --git a/src/unk_020302D0.c b/src/unk_020302D0.c
index c0a55c7ffd..03dfbb6d86 100644
--- a/src/unk_020302D0.c
+++ b/src/unk_020302D0.c
@@ -10,13 +10,11 @@
 #include "savedata.h"
 
 void sub_020302D0(UnkStruct_020302DC *param0);
-UnkStruct_020302DC *sub_020302DC(SaveData *param0);
 BOOL sub_020302EC(UnkStruct_020302DC *param0);
 void sub_020302F4(UnkStruct_020302DC *param0, BOOL param1);
 void sub_02030308(UnkStruct_020302DC *param0, u8 param1, u8 param2, u8 param3, const void *param4);
 u32 sub_02030398(UnkStruct_020302DC *param0, u8 param1, u8 param2, u8 param3, void *param4);
 void sub_02030410(UnkStruct_0203041C *param0);
-UnkStruct_0203041C *sub_0203041C(SaveData *param0);
 void sub_02030430(UnkStruct_0203041C *param0, u8 param1, u8 param2, u8 param3, const void *param4);
 u32 sub_02030470(UnkStruct_0203041C *param0, u8 param1, u8 param2, u8 param3, void *param4);
 
@@ -26,9 +24,9 @@ void sub_020302D0(UnkStruct_020302DC *param0)
     return;
 }
 
-UnkStruct_020302DC *sub_020302DC(SaveData *param0)
+UnkStruct_020302DC *sub_020302DC(SaveData *saveData)
 {
-    UnkStruct_0203068C *v0 = SaveData_SaveTable(param0, 23);
+    UnkStruct_0203068C *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
     return &v0->unk_8E0_val4;
 }
 
@@ -123,9 +121,9 @@ void sub_02030410(UnkStruct_0203041C *param0)
     return;
 }
 
-UnkStruct_0203041C *sub_0203041C(SaveData *param0)
+UnkStruct_0203041C *sub_0203041C(SaveData *saveData)
 {
-    UnkStruct_0203068C *v0 = SaveData_SaveTable(param0, 23);
+    UnkStruct_0203068C *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
     return &v0->unk_161C.unk_00;
 }
 
diff --git a/src/unk_02030494.c b/src/unk_02030494.c
index 52e39cd261..02a3cd26c1 100644
--- a/src/unk_02030494.c
+++ b/src/unk_02030494.c
@@ -10,13 +10,11 @@
 #include "savedata.h"
 
 void sub_02030494(UnkStruct_020304A0 *param0);
-UnkStruct_020304A0 *sub_020304A0(SaveData *param0);
 BOOL sub_020304B0(UnkStruct_020304A0 *param0);
 void sub_020304B8(UnkStruct_020304A0 *param0, BOOL param1);
 void sub_020304CC(UnkStruct_020304A0 *param0, u8 param1, u8 param2, u8 param3, const void *param4);
 u32 sub_0203054C(UnkStruct_020304A0 *param0, u8 param1, u8 param2, u8 param3, void *param4);
 void sub_020305AC(UnkStruct_020305B8 *param0);
-UnkStruct_020305B8 *sub_020305B8(SaveData *param0);
 void sub_020305CC(UnkStruct_020305B8 *param0, u8 param1, u8 param2, u8 param3, const void *param4);
 u32 sub_02030600(UnkStruct_020305B8 *param0, u8 param1, u8 param2, u8 param3, void *param4);
 
@@ -26,9 +24,9 @@ void sub_02030494(UnkStruct_020304A0 *param0)
     return;
 }
 
-UnkStruct_020304A0 *sub_020304A0(SaveData *param0)
+UnkStruct_020304A0 *sub_020304A0(SaveData *saveData)
 {
-    UnkStruct_0203068C *v0 = SaveData_SaveTable(param0, 23);
+    UnkStruct_0203068C *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
     return &v0->unk_8E0_val5;
 }
 
@@ -115,9 +113,9 @@ void sub_020305AC(UnkStruct_020305B8 *param0)
     return;
 }
 
-UnkStruct_020305B8 *sub_020305B8(SaveData *param0)
+UnkStruct_020305B8 *sub_020305B8(SaveData *saveData)
 {
-    UnkStruct_0203068C *v0 = SaveData_SaveTable(param0, 23);
+    UnkStruct_0203068C *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
     return &v0->unk_1620.unk_00;
 }
 
diff --git a/src/unk_0203061C.c b/src/unk_0203061C.c
index ac54f100c4..18f0864d93 100644
--- a/src/unk_0203061C.c
+++ b/src/unk_0203061C.c
@@ -33,9 +33,9 @@ void Frontier_Init(UnkStruct_0203068C *param0)
     return;
 }
 
-UnkStruct_0203068C *sub_0203068C(SaveData *param0)
+UnkStruct_0203068C *sub_0203068C(SaveData *saveData)
 {
-    return SaveData_SaveTable(param0, 23);
+    return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_FRONTIER);
 }
 
 u16 sub_02030698(UnkStruct_0203068C *param0, int param1, int param2)
diff --git a/src/unk_02030CE8.c b/src/unk_02030CE8.c
index 925c76375d..c0a12521e1 100644
--- a/src/unk_02030CE8.c
+++ b/src/unk_02030CE8.c
@@ -32,14 +32,14 @@ void Email_Init(UnkStruct_02030CEC *param0)
     SaveData_SetChecksum(35);
 }
 
-void sub_02030D10(SaveData *param0)
+void sub_02030D10(SaveData *saveData)
 {
-    Email_Init(SaveData_SaveTable(param0, 35));
+    Email_Init(SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_EMAIL));
 }
 
 BOOL sub_02030D20(SaveData *saveData)
 {
-    UnkStruct_02030CEC *v0 = SaveData_SaveTable(saveData, 35);
+    UnkStruct_02030CEC *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_EMAIL);
 
     if (v0->unk_00[0] == '\0') {
         return 0;
@@ -48,23 +48,23 @@ BOOL sub_02030D20(SaveData *saveData)
     return 1;
 }
 
-void sub_02030D38(SaveData *param0, const char *param1)
+void sub_02030D38(SaveData *saveData, const char *param1)
 {
-    UnkStruct_02030CEC *v0 = SaveData_SaveTable(param0, 35);
+    UnkStruct_02030CEC *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_EMAIL);
 
     strcpy(v0->unk_00, param1);
     SaveData_SetChecksum(35);
 }
 
-char *sub_02030D50(SaveData *param0)
+char *sub_02030D50(SaveData *saveData)
 {
-    UnkStruct_02030CEC *v0 = SaveData_SaveTable(param0, 35);
+    UnkStruct_02030CEC *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_EMAIL);
     return v0->unk_00;
 }
 
-void sub_02030D5C(SaveData *param0, int param1, u32 param2)
+void sub_02030D5C(SaveData *saveData, int param1, u32 param2)
 {
-    UnkStruct_02030CEC *v0 = SaveData_SaveTable(param0, 35);
+    UnkStruct_02030CEC *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_EMAIL);
 
     switch (param1) {
     case 0:
@@ -84,9 +84,9 @@ void sub_02030D5C(SaveData *param0, int param1, u32 param2)
     SaveData_SetChecksum(35);
 }
 
-u32 sub_02030D98(SaveData *param0, int param1)
+u32 sub_02030D98(SaveData *saveData, int param1)
 {
-    UnkStruct_02030CEC *v0 = SaveData_SaveTable(param0, 35);
+    UnkStruct_02030CEC *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_EMAIL);
 
     switch (param1) {
     case 0:
@@ -141,11 +141,11 @@ u32 sub_02030E48(SaveData *param0, UnkStruct_ov96_0223B574 *param1)
     return v0;
 }
 
-void sub_02030E78(SaveData *param0, UnkStruct_ov96_0223B574 *param1)
+void sub_02030E78(SaveData *saveData, UnkStruct_ov96_0223B574 *param1)
 {
-    UnkStruct_02030CEC *v0 = SaveData_SaveTable(param0, 35);
+    UnkStruct_02030CEC *v0 = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_EMAIL);
 
-    sub_02030DD0(param0, param1);
+    sub_02030DD0(saveData, param1);
 
     param1->unk_58 = v0->unk_38;
     param1->unk_5A = v0->unk_3A;
diff --git a/src/unk_02030EA4.c b/src/unk_02030EA4.c
index 7281f5d8c3..24cf468ce9 100644
--- a/src/unk_02030EA4.c
+++ b/src/unk_02030EA4.c
@@ -21,10 +21,9 @@ void WiFiQuestion_Init(UnkStruct_02030EC4 *param0)
     param0->unk_00 = 0xffffffff;
 }
 
-UnkStruct_02030EC4 *sub_02030EC4(SaveData *param0)
+UnkStruct_02030EC4 *sub_02030EC4(SaveData *saveData)
 {
-    UnkStruct_02030EC4 *v0 = SaveData_SaveTable(param0, 36);
-    return v0;
+    return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_WIFI_QUESTIONS);
 }
 
 u32 sub_02030ED0(const UnkStruct_02030EC4 *param0)
diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c
index 179ab4e595..b27d00b648 100644
--- a/src/unk_0203D1B8.c
+++ b/src/unk_0203D1B8.c
@@ -963,7 +963,7 @@ static void sub_0203DB38(UnkStruct_ov88_0223C370 *param0, FieldSystem *fieldSyst
 {
     param0->unk_04 = SaveData_GetTrainerInfo(fieldSystem->saveData);
     param0->unk_08 = SaveData_GetParty(fieldSystem->saveData);
-    param0->unk_0C = SaveData_SaveTable(fieldSystem->saveData, 9);
+    param0->unk_0C = SaveData_SaveTable(fieldSystem->saveData, SAVE_TABLE_ENTRY_PAL_PAD);
     param0->unk_14 = sub_0202C878(fieldSystem->saveData);
     param0->unk_18 = SaveData_GetOptions(fieldSystem->saveData);
     param0->unk_24 = SaveData_GetPokedex(fieldSystem->saveData);
@@ -1351,7 +1351,7 @@ void sub_0203E0FC(FieldSystem *fieldSystem, int param1)
 
     v0->unk_00 = sub_0202DA40(fieldSystem->saveData);
     v0->unk_04 = SaveData_GetSystemData(fieldSystem->saveData);
-    v0->unk_08 = SaveData_SaveTable(fieldSystem->saveData, 2);
+    v0->unk_08 = SaveData_SaveTable(fieldSystem->saveData, SAVE_TABLE_ENTRY_PARTY);
     v0->unk_0C = SaveData_GetPCBoxes(fieldSystem->saveData);
     v0->unk_10 = SaveData_GetPokedex(fieldSystem->saveData);
     v0->unk_14 = sub_0202B370(fieldSystem->saveData);
diff --git a/src/unk_0205C22C.c b/src/unk_0205C22C.c
index ca5e2724c3..b9623fee6f 100644
--- a/src/unk_0205C22C.c
+++ b/src/unk_0205C22C.c
@@ -65,7 +65,7 @@ UnkStruct_0205C22C *sub_0205C22C(UnkStruct_0205B43C *param0)
     v0->unk_47C = 1;
     v0->unk_04 = SysTask_Start(sub_0205C304, v0, 11);
     v0->fieldSystem = sub_0205B770(param0);
-    v0->unk_474 = SaveData_SaveTable(v0->fieldSystem->saveData, 9);
+    v0->unk_474 = SaveData_SaveTable(v0->fieldSystem->saveData, SAVE_TABLE_ENTRY_PAL_PAD);
     v0->playerAvatar = v0->fieldSystem->playerAvatar;
 
     Heap_CreateAtEnd(HEAP_ID_FIELDMAP, HEAP_ID_89, 10000);