diff --git a/include/field/field_system.h b/include/field/field_system.h
index f0709fe702..2064d8fb40 100644
--- a/include/field/field_system.h
+++ b/include/field/field_system.h
@@ -105,7 +105,7 @@ typedef struct FieldSystem_t {
     UnkStruct_ov5_021EB0E0 *unk_8C;
     int unk_90;
     RadarChain *chain;
-    BagCursor *unk_98;
+    BagCursor *bagCursor;
     JournalEntry *journalEntry;
     DynamicTerrainHeightManager *dynamicTerrainHeightMan;
     MapPropManager *mapPropManager;
diff --git a/include/overlay013/struct_ov13_0221FC20.h b/include/overlay013/struct_ov13_0221FC20.h
index 03f4d5a50a..dc72b6e6d9 100644
--- a/include/overlay013/struct_ov13_0221FC20.h
+++ b/include/overlay013/struct_ov13_0221FC20.h
@@ -18,12 +18,12 @@ typedef struct {
     u8 unk_15;
     u32 unk_18[2];
     u16 unk_20;
-    u16 unk_22;
+    u16 unk_22; // Item?
     u16 unk_24;
     s32 unk_28;
     u8 unk_2C[6];
     u8 unk_32;
-    u8 unk_33;
+    u8 unk_33; // Item Category?
     u8 unk_34;
     u8 unk_35;
     u8 unk_36;
diff --git a/include/overlay013/struct_ov13_022264F4.h b/include/overlay013/struct_ov13_022264F4.h
index ce7a81b389..75286bc23d 100644
--- a/include/overlay013/struct_ov13_022264F4.h
+++ b/include/overlay013/struct_ov13_022264F4.h
@@ -17,7 +17,7 @@ typedef struct {
     u16 unk_1C;
     u8 unk_1E;
     u8 unk_1F;
-    u16 unk_20;
+    u16 unk_20; // Item?
     u8 unk_22;
     u8 unk_23;
     u8 unk_24;
diff --git a/include/overlay065/struct_ov65_0222EBE0_t.h b/include/overlay065/struct_ov65_0222EBE0_t.h
index 4dbf7b3c18..556537835e 100644
--- a/include/overlay065/struct_ov65_0222EBE0_t.h
+++ b/include/overlay065/struct_ov65_0222EBE0_t.h
@@ -37,7 +37,7 @@ struct UnkStruct_ov65_0222EBE0_t {
     StringList *unk_154;
     ListMenu *unk_158;
     BgConfig *unk_15C;
-    SaveData *unk_160;
+    SaveData *saveData;
     StringTemplate *unk_164;
     MessageLoader *unk_168;
     MessageLoader *unk_16C;
diff --git a/include/overlay082/struct_ov82_0223B164.h b/include/overlay082/struct_ov82_0223B164.h
index c45e7561f3..f74bb116be 100644
--- a/include/overlay082/struct_ov82_0223B164.h
+++ b/include/overlay082/struct_ov82_0223B164.h
@@ -11,12 +11,12 @@
 typedef struct {
     u8 padding_00[4];
     int unk_04;
-    PoffinCase *unk_08;
-    SaveData *unk_0C;
-    TrainerInfo *unk_10;
-    Bag *unk_14;
-    Options *unk_18;
-    JournalEntry *unk_1C;
+    PoffinCase *poffinCase;
+    SaveData *saveData;
+    TrainerInfo *trainerInfo;
+    Bag *bag;
+    Options *options;
+    JournalEntry *journalEntry;
     BOOL unk_20;
     BOOL unk_24;
 } UnkStruct_ov82_0223B164;
diff --git a/include/overlay083/struct_ov83_0223C344.h b/include/overlay083/struct_ov83_0223C344.h
index e565728d9c..a843dbce91 100644
--- a/include/overlay083/struct_ov83_0223C344.h
+++ b/include/overlay083/struct_ov83_0223C344.h
@@ -12,7 +12,7 @@ typedef struct {
     u16 unk_06_0 : 8;
     u16 unk_06_8 : 4;
     u16 unk_06_12 : 4;
-    int unk_08;
+    int unk_08; // Item?
     BagCursor *unk_0C;
     UnkStruct_ov82_0223B164 *unk_10;
     int unk_14;
diff --git a/include/overlay098/struct_ov98_02246E88.h b/include/overlay098/struct_ov98_02246E88.h
index a14922fb69..244d999e4f 100644
--- a/include/overlay098/struct_ov98_02246E88.h
+++ b/include/overlay098/struct_ov98_02246E88.h
@@ -14,7 +14,7 @@
 
 typedef struct {
     OverlayManager *unk_00;
-    SaveData *unk_04;
+    SaveData *saveData;
     Options *unk_08;
     void *unk_0C;
     NNSFndHeapHandle unk_10;
diff --git a/include/overlay098/struct_ov98_02247168.h b/include/overlay098/struct_ov98_02247168.h
index 27f8217a49..30a2f955f8 100644
--- a/include/overlay098/struct_ov98_02247168.h
+++ b/include/overlay098/struct_ov98_02247168.h
@@ -4,7 +4,7 @@
 #include "savedata.h"
 
 typedef struct {
-    SaveData *unk_00;
+    SaveData *saveData;
     int unk_04;
     int unk_08;
 } UnkStruct_ov98_02247168;
diff --git a/include/overlay104/struct_ov104_02230BE4.h b/include/overlay104/struct_ov104_02230BE4.h
index 42526fc666..79a6376313 100644
--- a/include/overlay104/struct_ov104_02230BE4.h
+++ b/include/overlay104/struct_ov104_02230BE4.h
@@ -10,10 +10,10 @@
 
 typedef struct {
     void *unk_00;
-    const Options *unk_04;
-    SaveData *unk_08;
-    JournalEntry *unk_0C;
-    BagCursor *unk_10;
+    const Options *options;
+    SaveData *saveData;
+    JournalEntry *journalEntry;
+    BagCursor *bagCursor;
     int unk_14;
     int unk_18;
     int unk_1C;
diff --git a/include/struct_defs/struct_0207AE68_t.h b/include/struct_defs/struct_0207AE68_t.h
index ca65ac3bef..1cb2f1ad96 100644
--- a/include/struct_defs/struct_0207AE68_t.h
+++ b/include/struct_defs/struct_0207AE68_t.h
@@ -46,7 +46,7 @@ struct UnkStruct_0207AE68_t {
     GameRecords *records;
     Poketch *poketch;
     void *unk_58;
-    int unk_5C;
+    int heapID;
     u16 unk_60;
     u16 unk_62;
     u8 unk_64;
diff --git a/include/unk_0202ACE0.h b/include/unk_0202ACE0.h
index 5df7341add..5d0bf2a9a3 100644
--- a/include/unk_0202ACE0.h
+++ b/include/unk_0202ACE0.h
@@ -30,6 +30,6 @@ void sub_0202B1F8(UnkStruct_0202B370 *param0, int param1, int param2);
 void sub_0202B220(UnkStruct_0202B370 *param0, int param1, int param2);
 void sub_0202B248(UnkStruct_0202B370 *param0, int param1, int param2);
 void sub_0202B270(UnkStruct_0202B370 *param0, int param1, int param2);
-UnkStruct_0202B370 *sub_0202B370(SaveData *param0);
+UnkStruct_0202B370 *sub_0202B370(SaveData *saveData);
 
 #endif // POKEPLATINUM_UNK_0202ACE0_H
diff --git a/include/unk_0202F1D4.h b/include/unk_0202F1D4.h
index 6e3eea41db..be7ff69cb3 100644
--- a/include/unk_0202F1D4.h
+++ b/include/unk_0202F1D4.h
@@ -11,7 +11,7 @@
 
 int BattleRecording_SaveSize(void);
 void BattleRecording_Init(BattleRecording *param0);
-void sub_0202F1F8(SaveData *param0, int param1, int *param2);
+void sub_0202F1F8(SaveData *saveData, int heapID, int *param2);
 void sub_0202F22C(void);
 BOOL sub_0202F250(void);
 BattleRecording *sub_0202F264(void);
diff --git a/include/unk_020972FC.h b/include/unk_020972FC.h
index 438ca4f89d..8bd81b7613 100644
--- a/include/unk_020972FC.h
+++ b/include/unk_020972FC.h
@@ -4,7 +4,7 @@
 #include "struct_defs/struct_020972FC.h"
 
 UnkStruct_020972FC *sub_020972FC(u8 heapID);
-void sub_02097320(UnkStruct_020972FC *param0, u16 param1, u16 param2);
+void sub_02097320(UnkStruct_020972FC *param0, u16 item, u16 param2);
 void sub_0209733C(UnkStruct_020972FC *param0, u8 param1, u8 param2, u8 param3);
 u8 sub_02097368(u32 *param0, u16 param1);
 void sub_02097390(UnkStruct_020972FC *param0, u8 *param1, u8 *param2);
diff --git a/src/field_battle_data_transfer.c b/src/field_battle_data_transfer.c
index 10b5c15106..2d994834b2 100644
--- a/src/field_battle_data_transfer.c
+++ b/src/field_battle_data_transfer.c
@@ -175,7 +175,7 @@ FieldBattleDTO *FieldBattleDTO_NewCatchingTutorial(enum HeapId heapID, const Fie
     Heap_FreeToHeap(mon);
 
     dto->pcBoxes = SaveData_PCBoxes(fieldSystem->saveData);
-    dto->bagCursor = fieldSystem->unk_98;
+    dto->bagCursor = fieldSystem->bagCursor;
     dto->subscreenCursorOn = NULL;
     dto->records = SaveData_GetGameRecordsPtr(fieldSystem->saveData);
     dto->journalEntry = fieldSystem->journalEntry;
@@ -282,7 +282,7 @@ void FieldBattleDTO_InitFromGameState(FieldBattleDTO *dto, const FieldSystem *fi
 
 void FieldBattleDTO_Init(FieldBattleDTO *dto, const FieldSystem *fieldSystem)
 {
-    FieldBattleDTO_InitFromGameState(dto, fieldSystem, fieldSystem->saveData, fieldSystem->location->mapId, fieldSystem->journalEntry, fieldSystem->unk_98, fieldSystem->battleSubscreenCursorOn);
+    FieldBattleDTO_InitFromGameState(dto, fieldSystem, fieldSystem->saveData, fieldSystem->location->mapId, fieldSystem->journalEntry, fieldSystem->bagCursor, fieldSystem->battleSubscreenCursorOn);
     FieldBattleDTO_CopyPlayerInfoToTrainerData(dto);
 }
 
@@ -324,7 +324,7 @@ void FieldBattleDTO_InitWithNormalizedMonLevels(FieldBattleDTO *dto, const Field
 
     dto->pcBoxes = SaveData_PCBoxes(fieldSystem->saveData);
     dto->timeOfDay = FieldSystem_GetTimeOfDay(fieldSystem);
-    dto->bagCursor = fieldSystem->unk_98;
+    dto->bagCursor = fieldSystem->bagCursor;
     dto->subscreenCursorOn = fieldSystem->battleSubscreenCursorOn;
     dto->poketch = SaveData_PoketchData(fieldSystem->saveData);
     dto->unk_104 = sub_0202C878(fieldSystem->saveData);
@@ -390,7 +390,7 @@ void FieldBattleDTO_InitWithPartyOrder(FieldBattleDTO *dto, const FieldSystem *f
 
     dto->pcBoxes = SaveData_PCBoxes(fieldSystem->saveData);
     dto->timeOfDay = FieldSystem_GetTimeOfDay(fieldSystem);
-    dto->bagCursor = fieldSystem->unk_98;
+    dto->bagCursor = fieldSystem->bagCursor;
     dto->subscreenCursorOn = fieldSystem->battleSubscreenCursorOn;
     dto->unk_104 = sub_0202C878(fieldSystem->saveData);
     dto->records = SaveData_GetGameRecordsPtr(fieldSystem->saveData);
diff --git a/src/field_system.c b/src/field_system.c
index 4de79a7c52..97951d5333 100644
--- a/src/field_system.c
+++ b/src/field_system.c
@@ -165,7 +165,7 @@ static FieldSystem *InitFieldSystem(OverlayManager *ovyManager)
 
     MapHeaderData_Init(fieldSystem, HEAP_ID_FIELDMAP);
 
-    fieldSystem->unk_98 = BagCursor_New(HEAP_ID_FIELDMAP);
+    fieldSystem->bagCursor = BagCursor_New(HEAP_ID_FIELDMAP);
 
     fieldSystem->chain = RadarChain_Init(HEAP_ID_FIELDMAP);
     RadarChain_Clear(fieldSystem->chain);
@@ -182,7 +182,7 @@ static void TeardownFieldSystem(OverlayManager *ovyManager)
 
     MapMatrix_Free(fieldSystem->mapMatrix);
     MapHeaderData_Free(fieldSystem);
-    Heap_FreeToHeap(fieldSystem->unk_98);
+    Heap_FreeToHeap(fieldSystem->bagCursor);
     RadarChain_Free(fieldSystem->chain);
     PokedexMemory_Free(fieldSystem->pokedexMemory);
     sub_0209C388(fieldSystem->battleSubscreenCursorOn);
diff --git a/src/overlay005/ov5_021EA874.c b/src/overlay005/ov5_021EA874.c
index bc0e17967e..43524cbad0 100644
--- a/src/overlay005/ov5_021EA874.c
+++ b/src/overlay005/ov5_021EA874.c
@@ -94,7 +94,7 @@ static BOOL ov5_021EA8F0(UnkStruct_ov5_021EAE78 *param0)
         return 1;
     }
 
-    if (Bag_CanRemoveItem(SaveData_GetBag(param0->unk_34), 437, 1, 4) == 1) {
+    if (Bag_CanRemoveItem(SaveData_GetBag(param0->unk_34), ITEM_PAL_PAD, 1, HEAP_ID_FIELD) == TRUE) {
         v1 = CommInfo_TrainerInfo(param0->unk_8C);
         StringTemplate_SetPlayerName(param0->unk_38, 0, v1);
         ov5_021EAE78(param0, 57);
diff --git a/src/overlay005/vs_seeker.c b/src/overlay005/vs_seeker.c
index 8c90395361..33f9d5d771 100644
--- a/src/overlay005/vs_seeker.c
+++ b/src/overlay005/vs_seeker.c
@@ -571,7 +571,7 @@ BOOL VsSeeker_UpdateStepCount(FieldSystem *fieldSystem)
     u16 battery = SystemVars_GetVsSeekerBattery(varsFlags);
     u16 activeStepCount = SystemVars_GetVsSeekerStepCount(varsFlags);
 
-    if (Bag_CanRemoveItem(SaveData_GetBag(fieldSystem->saveData), 443, 1, 4) == 1
+    if (Bag_CanRemoveItem(SaveData_GetBag(fieldSystem->saveData), ITEM_VS_SEEKER, 1, HEAP_ID_FIELD) == TRUE
         && battery < VS_SEEKER_MAX_BATTERY) {
         battery++;
         SystemVars_SetVsSeekerBattery(varsFlags, battery);
diff --git a/src/overlay007/shop_menu.c b/src/overlay007/shop_menu.c
index a7c4b45a20..4491c4f0a3 100644
--- a/src/overlay007/shop_menu.c
+++ b/src/overlay007/shop_menu.c
@@ -1620,7 +1620,7 @@ static void Shop_FinishScreenTransition(FieldTask *task)
     Bag *bag = SaveData_GetBag(fieldSystem->saveData);
     shopMenu->unk_04 = sub_0207D824(bag, sShop_BagPockets, HEAP_ID_FIELDMAP);
 
-    sub_0207CB2C(shopMenu->unk_04, fieldSystem->saveData, 2, fieldSystem->unk_98);
+    sub_0207CB2C(shopMenu->unk_04, fieldSystem->saveData, 2, fieldSystem->bagCursor);
     sub_0203D1E4(fieldSystem, shopMenu->unk_04);
     FieldTask_InitJump(task, FieldTask_ShopMisc, shopMenu);
 
diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c
index fc347bf55f..dabe1a1d9c 100644
--- a/src/overlay010/ov10_0221F800.c
+++ b/src/overlay010/ov10_0221F800.c
@@ -387,7 +387,7 @@ void ov10_0221F800(UnkStruct_ov10_0221F800 *param0)
 
     if (v0->unk_BBC == 1) {
         if ((v0->unk_00->unk_00 != NULL) && (v0->unk_00->unk_00->saveData != NULL)) {
-            v0->unk_BBC = Bag_CanRemoveItem(SaveData_GetBag(v0->unk_00->unk_00->saveData), 465, 1, param0->heapId);
+            v0->unk_BBC = Bag_CanRemoveItem(SaveData_GetBag(v0->unk_00->unk_00->saveData), ITEM_VS_RECORDER, 1, param0->heapId);
         }
     }
 }
diff --git a/src/overlay013/ov13_0221FC20.c b/src/overlay013/ov13_0221FC20.c
index 53f2c1080a..75fab5ef19 100644
--- a/src/overlay013/ov13_0221FC20.c
+++ b/src/overlay013/ov13_0221FC20.c
@@ -95,7 +95,7 @@ static u8 ov13_022219DC(UnkStruct_ov13_022213F0 *param0);
 static void ov13_02221A04(UnkStruct_ov13_022213F0 *param0);
 static void ov13_02221A3C(UnkStruct_ov13_022213F0 *param0);
 static u8 ov13_0222194C(UnkStruct_ov13_022213F0 *param0);
-static void ov13_02221A54(BattleSystem *battleSys, u16 param1, u16 param2, u32 param3);
+static void ov13_02221A54(BattleSystem *battleSys, u16 item, u16 category, u32 heapID);
 
 static const TouchScreenRect Unk_ov13_02228DEC[] = {
     { 0x0, 0x2F, 0x0, 0x7F },
@@ -1729,11 +1729,11 @@ static void ov13_02221A3C(UnkStruct_ov13_022213F0 *param0)
     Bg_ScheduleTilemapTransfer(param0->unk_1E0, 7);
 }
 
-static void ov13_02221A54(BattleSystem *battleSys, u16 param1, u16 param2, u32 param3)
+static void ov13_02221A54(BattleSystem *battleSys, u16 item, u16 category, u32 heapID)
 {
-    if ((param1 != 65) && (param1 != 67) && (param1 != 66)) {
-        Bag_TryRemoveItem(BattleSystem_Bag(battleSys), param1, 1, param3);
+    if (item != ITEM_BLUE_FLUTE && item != ITEM_RED_FLUTE && item != ITEM_YELLOW_FLUTE) {
+        Bag_TryRemoveItem(BattleSystem_Bag(battleSys), item, 1, heapID);
     }
 
-    Bag_SetLastBattleItemUsed(BattleSystem_BagCursor(battleSys), param1, param2);
+    Bag_SetLastBattleItemUsed(BattleSystem_BagCursor(battleSys), item, category);
 }
diff --git a/src/overlay013/ov13_022264F4.c b/src/overlay013/ov13_022264F4.c
index a7838f2df7..b4c68f9e6a 100644
--- a/src/overlay013/ov13_022264F4.c
+++ b/src/overlay013/ov13_022264F4.c
@@ -67,7 +67,7 @@ static u8 ov13_02226A5C(UnkStruct_ov13_02227244 *param0);
 static void ov13_02227118(UnkStruct_ov13_02227244 *param0, u8 param1);
 static void ov13_022271D0(UnkStruct_ov13_02227244 *param0, u8 param1);
 static int ov13_02227238(UnkStruct_ov13_02227244 *param0, const TouchScreenRect *rect);
-static void ov13_02227260(BattleSystem *battleSys, u16 param1, u16 param2, u32 param3);
+static void ov13_02227260(BattleSystem *battleSys, u16 item, u16 category, u32 heapID);
 
 static const TouchScreenRect Unk_ov13_02229A1C[] = {
     { 0x8, 0x4F, 0x0, 0x7F },
@@ -824,8 +824,8 @@ int ov13_02227244(UnkStruct_ov13_02227244 *param0)
     return v0;
 }
 
-static void ov13_02227260(BattleSystem *battleSys, u16 param1, u16 param2, u32 param3)
+static void ov13_02227260(BattleSystem *battleSys, u16 item, u16 category, u32 heapID)
 {
-    Bag_TryRemoveItem(BattleSystem_Bag(battleSys), param1, 1, param3);
-    Bag_SetLastBattleItemUsed(BattleSystem_BagCursor(battleSys), param1, param2);
+    Bag_TryRemoveItem(BattleSystem_Bag(battleSys), item, 1, heapID);
+    Bag_SetLastBattleItemUsed(BattleSystem_BagCursor(battleSys), item, category);
 }
diff --git a/src/overlay013/ov13_02227A4C.c b/src/overlay013/ov13_02227A4C.c
index 0b78bf2a97..21e6f37e64 100644
--- a/src/overlay013/ov13_02227A4C.c
+++ b/src/overlay013/ov13_02227A4C.c
@@ -14,7 +14,7 @@ u8 ov13_02227A4C(UnkStruct_ov13_02227244 *param0)
         return 0;
     }
 
-    if (Bag_CanRemoveItem(param0->unk_00->unk_08, param0->unk_00->unk_20, 1, param0->unk_00->heapID) == 0) {
+    if (Bag_CanRemoveItem(param0->unk_00->unk_08, param0->unk_00->unk_20, 1, param0->unk_00->heapID) == FALSE) {
         param0->unk_00->unk_20 = 0;
         param0->unk_00->unk_1F = 0;
         return 0;
diff --git a/src/overlay019/ov19_021D0D80.c b/src/overlay019/ov19_021D0D80.c
index 2951d780de..878a3ab168 100644
--- a/src/overlay019/ov19_021D0D80.c
+++ b/src/overlay019/ov19_021D0D80.c
@@ -2514,19 +2514,19 @@ static void ov19_021D3D44(UnkStruct_ov19_021D5DF8 *param0, u32 *param1)
 
 static void ov19_021D3FB0(UnkStruct_ov19_021D5DF8 *param0, u32 *param1)
 {
-    static u32 v0;
+    static u32 item;
 
     switch (*param1) {
     case 0:
-        v0 = ov19_GetPreviewedMonHeldItem(&param0->unk_00);
+        item = ov19_GetPreviewedMonHeldItem(&param0->unk_00);
 
-        if (Item_IsMail(v0)) {
+        if (Item_IsMail(item)) {
             Sound_PlayEffect(SEQ_SE_DP_BOX03);
             ov19_021D5408(&param0->unk_00, 24);
             ov19_021D6594(param0->unk_114, 24);
             (*param1) = 4;
         } else {
-            StringTemplate_SetItemName(param0->unk_19C, 0, v0);
+            StringTemplate_SetItemName(param0->unk_19C, 0, item);
             ov19_021DF964(&(param0->unk_00), 0);
             ov19_021D5408(&param0->unk_00, 23);
             ov19_021D6594(param0->unk_114, 25);
@@ -2554,7 +2554,7 @@ static void ov19_021D3FB0(UnkStruct_ov19_021D5DF8 *param0, u32 *param1)
         }
         break;
     case 2:
-        if (Bag_TryAddItem(SaveData_GetBag(param0->unk_11C), v0, 1, HEAP_ID_9)) {
+        if (Bag_TryAddItem(SaveData_GetBag(param0->unk_11C), item, 1, HEAP_ID_9)) {
             ov19_021D5BE8(&param0->unk_00, ITEM_NONE, param0);
             ov19_021D6594(param0->unk_114, 22);
             ov19_021D6594(param0->unk_114, 6);
@@ -2591,19 +2591,19 @@ static void ov19_021D3FB0(UnkStruct_ov19_021D5DF8 *param0, u32 *param1)
 
 static void ov19_021D4184(UnkStruct_ov19_021D5DF8 *param0, u32 *param1)
 {
-    static u32 v0;
+    static u32 item;
 
     switch (*param1) {
     case 0:
-        v0 = ov19_021D5F88(&param0->unk_00);
+        item = ov19_021D5F88(&param0->unk_00);
 
-        if (Item_IsMail(v0)) {
+        if (Item_IsMail(item)) {
             Sound_PlayEffect(SEQ_SE_DP_BOX03);
             ov19_021D5408(&param0->unk_00, 24);
             ov19_021D6594(param0->unk_114, 24);
             (*param1) = 5;
         } else {
-            StringTemplate_SetItemName(param0->unk_19C, 0, v0);
+            StringTemplate_SetItemName(param0->unk_19C, 0, item);
             ov19_021D5408(&param0->unk_00, 26);
             ov19_021DF964(&(param0->unk_00), 0);
             ov19_021D6594(param0->unk_114, 25);
@@ -2631,7 +2631,7 @@ static void ov19_021D4184(UnkStruct_ov19_021D5DF8 *param0, u32 *param1)
         }
         break;
     case 2:
-        if (Bag_TryAddItem(SaveData_GetBag(param0->unk_11C), v0, 1, HEAP_ID_9)) {
+        if (Bag_TryAddItem(SaveData_GetBag(param0->unk_11C), item, 1, HEAP_ID_9)) {
             if (ov19_021D5F7C(&param0->unk_00) != 0) {
                 ov19_021D5D54(&param0->unk_00);
                 *param1 = 4;
@@ -4437,10 +4437,10 @@ u32 ov19_021D5F7C(const UnkStruct_ov19_021D4DF0 *param0)
 
 u32 ov19_021D5F88(const UnkStruct_ov19_021D4DF0 *param0)
 {
-    u32 v0 = ov19_021D5F7C(param0);
+    u32 item = ov19_021D5F7C(param0);
 
-    if (v0 != 0) {
-        return v0;
+    if (item != ITEM_NONE) {
+        return item;
     }
 
     return ov19_GetPreviewedMonHeldItem(param0);
diff --git a/src/overlay023/ov23_0224F294.c b/src/overlay023/ov23_0224F294.c
index f51cc8a341..0254debdff 100644
--- a/src/overlay023/ov23_0224F294.c
+++ b/src/overlay023/ov23_0224F294.c
@@ -1310,12 +1310,12 @@ static BOOL ov23_022507D8(SysTask *param0, void *param1)
         ov23_0224FCF4(v0);
 
         if (v1 == 3) {
-            int v3 = sub_02028938(Unk_ov23_022577B8->unk_05);
+            int item = sub_02028938(Unk_ov23_022577B8->unk_05);
             Bag *v4 = SaveData_GetBag(v0->fieldSystem->saveData);
 
             Sound_PlayEffect(SEQ_SE_CONFIRM);
 
-            if (Bag_TryAddItem(v4, v3, 1, HEAP_ID_FIELD)) {
+            if (Bag_TryAddItem(v4, item, 1, HEAP_ID_FIELD)) {
                 sub_02028D80(Unk_ov23_022577B8->unk_00, Unk_ov23_022577B8->unk_04);
                 ov23_022541A0(ov23_0224219C(), 0, Unk_ov23_022577B8->unk_05);
 
diff --git a/src/overlay062/ov62_02231690.c b/src/overlay062/ov62_02231690.c
index 468a8c4398..9359a18a2c 100644
--- a/src/overlay062/ov62_02231690.c
+++ b/src/overlay062/ov62_02231690.c
@@ -1972,7 +1972,7 @@ void ov62_0223371C(UnkStruct_0208C06C *param0)
 {
     int v0;
 
-    sub_0202F1F8(param0->unk_830, 119, &v0);
+    sub_0202F1F8(param0->unk_830, HEAP_ID_119, &v0);
 
     {
         UnkStruct_02030A80 *v1 = (UnkStruct_02030A80 *)(&param0->unk_8B4.unk_00->unk_00);
diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c
index d008903143..1d027262fc 100644
--- a/src/overlay064/ov64_0222DCE0.c
+++ b/src/overlay064/ov64_0222DCE0.c
@@ -105,7 +105,7 @@ typedef struct {
 } UnkStruct_ov64_022301B4;
 
 typedef struct {
-    SaveData *unk_00;
+    SaveData *saveData;
     u8 unk_04;
     u8 unk_05;
     u8 unk_06;
@@ -373,7 +373,7 @@ static void ov64_02231E94(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0
 static void ov64_02232038(UnkStruct_ov64_0222E21C *param0, const UnkStruct_ov64_0223221C *param1);
 static void ov64_022320B8(UnkStruct_ov64_02230F98 *param0, u32 param1, u32 param2, UnkStruct_ov64_0222E060 *param3, UnkStruct_ov64_0222E21C *param4, u32 param5, u32 param6, u32 param7, u32 param8, Strbuf *param9, Strbuf *param10);
 static void ov64_02232138(UnkStruct_ov64_02230904 *param0, s32 param1);
-static BOOL ov64_0223217C(UnkStruct_ov64_0222E060 *param0, u32 param1);
+static BOOL ov64_0223217C(UnkStruct_ov64_0222E060 *param0, u32 heapID);
 
 static const UnkStruct_ov64_0223221C Unk_ov64_0223221C[3] = {
     { 0x0, 0x0, 0x20, 0x18 },
@@ -720,7 +720,7 @@ static void ov64_0222DFD0(UnkStruct_ov64_0222DFD0 *param0)
 
 static void ov64_0222E040(UnkStruct_ov64_0222E060 *param0, void *param1, u32 param2)
 {
-    param0->unk_00 = param1;
+    param0->saveData = param1;
     param0->unk_2C.unk_00 = Strbuf_Init(128, param2);
     param0->unk_2C.unk_04 = Strbuf_Init(128, param2);
 }
@@ -761,7 +761,7 @@ static u32 ov64_0222E09C(UnkStruct_ov64_0222E060 *param0, Strbuf *param1, Strbuf
     int v8;
     int v9;
 
-    v1 = sub_0202B370(param0->unk_00);
+    v1 = sub_0202B370(param0->saveData);
     v5 = DWC_CreateFriendKey(sub_0202AD28(v1));
 
     for (v0 = 0; v0 < 32; v0++) {
@@ -777,7 +777,7 @@ static u32 ov64_0222E09C(UnkStruct_ov64_0222E060 *param0, Strbuf *param1, Strbuf
                     return 1;
                 }
 
-                v8 = sub_02039140(param0->unk_00, v4, &v9);
+                v8 = sub_02039140(param0->saveData, v4, &v9);
 
                 if (v8 == 0) {
                     return 2;
@@ -818,7 +818,7 @@ static void ov64_0222E164(UnkStruct_ov64_0222E060 *param0)
 
     memset(&param0->unk_08, 0, sizeof(UnkStruct_ov64_022301B4));
 
-    v1 = sub_0202B370(param0->unk_00);
+    v1 = sub_0202B370(param0->saveData);
 
     param0->unk_08.unk_00 = 0;
 
@@ -1021,7 +1021,7 @@ static void ov64_0222E604(UnkStruct_ov64_0222E21C *param0)
 
 static void ov64_0222E620(UnkStruct_ov64_0222E21C *param0, const UnkStruct_ov64_0222E060 *param1, u32 param2)
 {
-    int v0 = Options_Frame(SaveData_Options(param1->unk_00));
+    int v0 = Options_Frame(SaveData_Options(param1->saveData));
 
     Font_LoadScreenIndicatorsPalette(0, 7 * 0x20, param2);
     LoadMessageBoxGraphics(param0->unk_00, Unk_ov64_02232258[1], (1 + 9), 8, v0, param2);
@@ -1678,7 +1678,7 @@ static BOOL ov64_0222F068(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E0
     UnkStruct_0202B370 *v1;
 
     if (param0->unk_00 == 1) {
-        v1 = sub_0202B370(param1->unk_00);
+        v1 = sub_0202B370(param1->saveData);
 
         for (v0 = 0; v0 < 32; v0++) {
             if (!sub_0202AF78(v1, v0)) {
@@ -1694,7 +1694,7 @@ static BOOL ov64_0222F068(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E0
 
 static void ov64_0222F09C(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 param3)
 {
-    param0->unk_DC = Options_TextFrameDelay(SaveData_Options(param1->unk_00));
+    param0->unk_DC = Options_TextFrameDelay(SaveData_Options(param1->saveData));
     ov64_0222F414(param0, param1, param2, param3);
 }
 
@@ -1785,7 +1785,7 @@ static int ov64_0222F0C4(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E06
         StartScreenTransition(0, 16, 16, 0x0, 6, 1, heapID);
 
         v2 = ov64_0222FF38(param0);
-        v1 = sub_0202B370(param1->unk_00);
+        v1 = sub_0202B370(param1->saveData);
 
         ov64_0222E158(param1, sub_0202AEF0(v1, param1->unk_08.unk_04[v2]));
         param1->unk_04 = 11;
@@ -1799,7 +1799,7 @@ static int ov64_0222F0C4(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E06
         break;
     case 12:
         v2 = ov64_0222FF38(param0);
-        v1 = sub_0202B370(param1->unk_00);
+        v1 = sub_0202B370(param1->saveData);
         sub_0202AF0C(v1, param1->unk_08.unk_04[v2], param1->unk_2C.unk_00);
     case 13:
         ov64_0222F668(param0, param1, param2, heapID);
@@ -1845,11 +1845,11 @@ static int ov64_0222F0C4(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E06
         break;
     case 19:
         if (ov64_02230008(param0) == 1) {
-            v1 = sub_0202B370(param1->unk_00);
+            v1 = sub_0202B370(param1->saveData);
             v2 = ov64_0222FF38(param0);
 
             sub_0202AFD4(v1, param1->unk_08.unk_04[v2]);
-            sub_02030788(sub_0203068C(param1->unk_00), param1->unk_08.unk_04[v2]);
+            sub_02030788(sub_0203068C(param1->saveData), param1->unk_08.unk_04[v2]);
             ov64_0222E164(param1);
             ov64_0222FC80(param0, param1, param2, param0->unk_00, param0->unk_04, 0, heapID);
             ov64_0222EA28(param2, 1);
@@ -2376,7 +2376,7 @@ static void ov64_0222FA70 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222
     u32 v2;
     u32 v3;
 
-    v1 = sub_0202B370(param1->unk_00);
+    v1 = sub_0202B370(param1->saveData);
     v3 = ov64_0222FF38(param0);
     v2 = sub_0202AD2C(v1, param1->unk_08.unk_04[v3], 8);
     v0 = Unk_ov64_0223226C;
@@ -2393,7 +2393,7 @@ static void ov64_0222FA70 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222
     Window_DrawStandardFrame(&param0->unk_E0, 1, 1, 9);
     Window_ScheduleCopyToVRAM(&param0->unk_E0);
 
-    ov64_0222E880(param2, param1->unk_00, param1->unk_08.unk_04[v3], param3);
+    ov64_0222E880(param2, param1->saveData, param1->unk_08.unk_04[v3], param3);
     ov64_0222FE70(param0, param2, 12, param3);
     ov64_0222EA28(param2, 0);
 }
@@ -2443,7 +2443,7 @@ static BOOL ov64_0222FBA4 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222
     u64 v2;
     u32 v3;
 
-    v0 = sub_0202B370(param1->unk_00);
+    v0 = sub_0202B370(param1->saveData);
     v3 = ov64_0222FF38(param0);
     v1 = sub_0202AED8(v0, param1->unk_08.unk_04[v3]);
     v2 = DWC_GetFriendKey(v1);
@@ -2451,7 +2451,7 @@ static BOOL ov64_0222FBA4 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222
     if (v2 != 0) {
         Sound_PlayEffect(SEQ_SE_DP_DECIDE);
         ov64_0222E7F8(param2, v2);
-        ov64_0222E880(param2, param1->unk_00, param1->unk_08.unk_04[v3], param3);
+        ov64_0222E880(param2, param1->saveData, param1->unk_08.unk_04[v3], param3);
         ov64_0222FE70(param0, param2, 55, param3);
         return 1;
     }
@@ -2463,7 +2463,7 @@ static void ov64_0222FC1C (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222
 {
     u32 v0 = ov64_0222FF38(param0);
 
-    ov64_0222E880(param2, param1->unk_00, param1->unk_08.unk_04[v0], param3);
+    ov64_0222E880(param2, param1->saveData, param1->unk_08.unk_04[v0], param3);
     ov64_0222FE70(param0, param2, 52, param3);
 }
 
@@ -2677,7 +2677,7 @@ static void ov64_022301B4 (UnkStruct_ov64_02230074 * param0, UnkStruct_ov64_0222
     int v1;
     UnkStruct_0202B370 * v2;
 
-    v2 = sub_0202B370(param1->unk_00);
+    v2 = sub_0202B370(param1->saveData);
 
     Window_FillTilemap(&param0->unk_08, 0);
     ov64_022302CC(param0, param2);
@@ -2774,7 +2774,7 @@ static int ov64_0223044C (UnkStruct_ov64_02230444 * param0, UnkStruct_ov64_0222D
         v0[2] = 4;
         v0[3] = 0;
 
-        param0->unk_08 = sub_02089400(heapID, 12, v0, SaveData_Options(param2->unk_00), 0, 0);
+        param0->unk_08 = sub_02089400(heapID, 12, v0, SaveData_Options(param2->saveData), 0, 0);
         ov64_0222DFD0(param1);
         param0->unk_00 = OverlayManager_New(&Unk_020F2DAC, param0->unk_04, heapID);
         param2->unk_04 = 1;
@@ -2859,7 +2859,7 @@ static UnkStruct_0208737C * ov64_022305DC (UnkStruct_ov64_02230444 * param0, Unk
 {
     UnkStruct_0208737C * v0;
 
-    v0 = sub_0208712C(heapID, 7, 0, 7, SaveData_Options(param1->unk_00));
+    v0 = sub_0208712C(heapID, 7, 0, 7, SaveData_Options(param1->saveData));
 
     if (param1->unk_34.unk_04 == 1) {
         {
@@ -3090,7 +3090,7 @@ static void ov64_02230804(UnkStruct_ov64_02230620 *param0, UnkStruct_ov64_0222E0
 
 static void ov64_0223081C(UnkStruct_ov64_02230620 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2)
 {
-    StringTemplate_SetPlayerName(param2->unk_214, 0, SaveData_GetTrainerInfo(param1->unk_00));
+    StringTemplate_SetPlayerName(param2->unk_214, 0, SaveData_GetTrainerInfo(param1->saveData));
     ov64_0222E738(param2, 46);
 
     Bg_LoadToTilemapRect(param2->unk_00, Unk_ov64_02232258[2], param0->unk_24->rawData, 0, 0, param0->unk_24->screenWidth / 8, param0->unk_24->screenHeight / 8);
@@ -3115,7 +3115,7 @@ static void ov64_0223087C(UnkStruct_ov64_02230620 *param0, UnkStruct_ov64_0222E2
 
 static void ov64_022308DC(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 param3)
 {
-    param0->unk_10 = SystemFlag_HandleFirstArrivalToZone(SaveData_GetVarsFlags(param1->unk_00), HANDLE_FLAG_CHECK, FIRST_ARRIVAL_BATTLE_PARK);
+    param0->unk_10 = SystemFlag_HandleFirstArrivalToZone(SaveData_GetVarsFlags(param1->saveData), HANDLE_FLAG_CHECK, FIRST_ARRIVAL_BATTLE_PARK);
 
     ov64_02230B1C(param0, param1, param2, param3);
 }
@@ -3312,7 +3312,7 @@ static void ov64_02230BA0(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E0
 
 static void ov64_02230BD8(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 param3)
 {
-    ov64_0222E880(param2, param1->unk_00, param1->unk_08.unk_04[param1->unk_07], param3);
+    ov64_0222E880(param2, param1->saveData, param1->unk_08.unk_04[param1->unk_07], param3);
     ov64_0222E738(param2, 13);
     ov64_02230C50(param0, param1, param2, 0, param0->unk_00, param3);
     ov64_0222EA28(param2, 1);
@@ -3394,7 +3394,7 @@ static BOOL ov64_02230EA8(UnkStruct_ov64_0222E060 *param0, int param1)
     int v0;
     u32 v1;
     s32 v2;
-    UnkStruct_0202B370 *v3 = sub_0202B370(param0->unk_00);
+    UnkStruct_0202B370 *v3 = sub_0202B370(param0->saveData);
     v2 = param0->unk_07;
 
     if (param1 == 0) {
@@ -5405,9 +5405,9 @@ static void ov64_02232138(UnkStruct_ov64_02230904 *param0, s32 param1)
     }
 }
 
-static BOOL ov64_0223217C(UnkStruct_ov64_0222E060 *param0, u32 param1)
+static BOOL ov64_0223217C(UnkStruct_ov64_0222E060 *param0, u32 heapID)
 {
-    if (!Bag_GetItemQuantity(SaveData_GetBag(param0->unk_00), 449, param1)) {
+    if (!Bag_GetItemQuantity(SaveData_GetBag(param0->saveData), ITEM_POFFIN_CASE, heapID)) {
         return 0;
     }
 
diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c
index 040f8dd724..3ba23c0f98 100644
--- a/src/overlay065/ov65_0222DCE0.c
+++ b/src/overlay065/ov65_0222DCE0.c
@@ -385,12 +385,12 @@ static const WindowTemplate Unk_ov65_0223894C = {
 
 static BOOL ov65_0222DCE0(UnkStruct_ov65_0222EBE0 *param0)
 {
-    return SystemFlag_HandleFirstArrivalToZone(SaveData_GetVarsFlags(param0->unk_160), HANDLE_FLAG_CHECK, FIRST_ARRIVAL_BATTLE_PARK);
+    return SystemFlag_HandleFirstArrivalToZone(SaveData_GetVarsFlags(param0->saveData), HANDLE_FLAG_CHECK, FIRST_ARRIVAL_BATTLE_PARK);
 }
 
 static BOOL ov65_0222DCF8(UnkStruct_ov65_0222EBE0 *param0)
 {
-    if (!Bag_GetItemQuantity(SaveData_GetBag(param0->unk_160), 449, 54)) {
+    if (!Bag_GetItemQuantity(SaveData_GetBag(param0->saveData), ITEM_POFFIN_CASE, HEAP_ID_54)) {
         return 0;
     }
 
@@ -640,7 +640,7 @@ static int ov65_0222DED4(int param0)
 
 static int ov65_0222DF88(UnkStruct_ov65_0222EBE0 *param0)
 {
-    Party *v0 = Party_GetFromSavedata(param0->unk_160);
+    Party *v0 = Party_GetFromSavedata(param0->saveData);
     Pokemon *v1;
     int v2 = Party_GetCurrentCount(v0);
     int v3, v4 = 0;
@@ -761,8 +761,8 @@ int ov65_0222E2A8(OverlayManager *param0, int *param1)
         VramTransfer_New(32, HEAP_ID_54);
 
         v0->unk_180 = 8;
-        v0->unk_160 = v1->unk_00;
-        v0->unk_00 = sub_0202B370(v0->unk_160);
+        v0->saveData = v1->saveData;
+        v0->unk_00 = sub_0202B370(v0->saveData);
         v0->unk_3B4 = v1->unk_04;
         v0->unk_3AC = 8;
         v0->unk_3D0 = -1;
@@ -1459,7 +1459,7 @@ static void ov65_0222ECA8(UnkStruct_ov65_0222EBE0 *param0, NARC *param1)
     Graphics_LoadTilemapToBgLayerFromOpenNARC(param1, 11, v0, 4, 0, 0, 0, HEAP_ID_54);
 
     {
-        int v1 = Options_Frame(SaveData_Options(param0->unk_160));
+        int v1 = Options_Frame(SaveData_Options(param0->saveData));
 
         LoadMessageBoxGraphics(v0, 2, (512 - (18 + 12)), 10, v1, HEAP_ID_54);
         LoadStandardWindowGraphics(v0, 2, ((512 - (18 + 12)) - 9), 11, 0, HEAP_ID_54);
@@ -1660,7 +1660,7 @@ static int ov65_0222F1A8(UnkStruct_ov65_0222EBE0 *param0, int param1)
         return param1;
     } else {
         if (v1 == 0) {
-            param0->unk_04 = sub_0203871C(param0->unk_160, sizeof(UnkStruct_0207DFAC));
+            param0->unk_04 = sub_0203871C(param0->saveData, sizeof(UnkStruct_0207DFAC));
             ov65_02232B58(param0, 23, 1);
             GF_ASSERT(param0->unk_188 == NULL);
             param0->unk_188 = Window_AddWaitDial(&param0->unk_330, (512 - (18 + 12)));
@@ -1729,10 +1729,10 @@ static int ov65_0222F304(UnkStruct_ov65_0222EBE0 *param0, int param1)
 
         if (v1 == 0) {
             WiFiList_Init(param0->unk_00);
-            Email_Init(SaveData_SaveTable(param0->unk_160, 35));
-            sub_02030764(sub_0203068C(param0->unk_160));
+            Email_Init(SaveData_SaveTable(param0->saveData, 35));
+            sub_02030764(sub_0203068C(param0->saveData));
             param0->unk_3A8 = 14;
-            param0->unk_04 = sub_0203871C(param0->unk_160, sizeof(UnkStruct_0207DFAC));
+            param0->unk_04 = sub_0203871C(param0->saveData, sizeof(UnkStruct_0207DFAC));
             ov65_02232B58(param0, 23, 1);
             GF_ASSERT(param0->unk_188 == NULL);
             param0->unk_188 = Window_AddWaitDial(&param0->unk_330, (512 - (18 + 12)));
@@ -1762,7 +1762,7 @@ static int ov65_0222F3DC(UnkStruct_ov65_0222EBE0 *param0, int param1)
 
         if (v1 == 0) {
             param0->unk_3A8 = 14;
-            param0->unk_04 = sub_0203871C(param0->unk_160, sizeof(UnkStruct_0207DFAC));
+            param0->unk_04 = sub_0203871C(param0->saveData, sizeof(UnkStruct_0207DFAC));
             ov65_02232B58(param0, 23, 1);
             GF_ASSERT(param0->unk_188 == NULL);
             param0->unk_188 = Window_AddWaitDial(&param0->unk_330, (512 - (18 + 12)));
@@ -1787,10 +1787,10 @@ static int ov65_0222F490(UnkStruct_ov65_0222EBE0 *param0, int param1)
 
 static void ov65_0222F4C4(UnkStruct_ov65_0222EBE0 *param0, int param1)
 {
-    TrainerInfo *v0 = SaveData_GetTrainerInfo(param0->unk_160);
-    Pokedex *v1 = SaveData_GetPokedex(param0->unk_160);
-    Party *v2 = Party_GetFromSavedata(param0->unk_160);
-    UnkStruct_0202C878 *v3 = sub_0202C878(param0->unk_160);
+    TrainerInfo *v0 = SaveData_GetTrainerInfo(param0->saveData);
+    Pokedex *v1 = SaveData_GetPokedex(param0->saveData);
+    Party *v2 = Party_GetFromSavedata(param0->saveData);
+    UnkStruct_0202C878 *v3 = sub_0202C878(param0->saveData);
     int v4, v5;
 
     GF_ASSERT((sizeof(UnkStruct_0207E060)) == sizeof(UnkStruct_0207E060));
@@ -2080,7 +2080,7 @@ static int ov65_0222F90C(UnkStruct_ov65_0222EBE0 *param0, int param1)
         MI_CpuClear8(param0->unk_CC, 32 * sizeof(int));
 
         ov65_0222EE98(param0);
-        param0->unk_04 = sub_0203871C(param0->unk_160, sizeof(UnkStruct_0207DFAC));
+        param0->unk_04 = sub_0203871C(param0->saveData, sizeof(UnkStruct_0207DFAC));
         ov65_02232B58(param0, 23, 1);
         GF_ASSERT(param0->unk_188 == NULL);
         param0->unk_188 = Window_AddWaitDial(&param0->unk_330, (512 - (18 + 12)));
@@ -2180,7 +2180,7 @@ static int ov65_0222FB44(UnkStruct_ov65_0222EBE0 *param0, int param1)
     }
 
     if (ov4_021D27E0()) {
-        SaveData_SaveStateInit(param0->unk_160, 0);
+        SaveData_SaveStateInit(param0->saveData, 0);
         param0->unk_3A8 = 71;
         return param1;
     }
@@ -2203,7 +2203,7 @@ static int ov65_0222FB44(UnkStruct_ov65_0222EBE0 *param0, int param1)
 static int ov65_0222FBD0(UnkStruct_ov65_0222EBE0 *param0, int param1)
 {
     if (ov4_021D27E0()) {
-        int v0 = SaveData_SaveStateMain(param0->unk_160);
+        int v0 = SaveData_SaveStateMain(param0->saveData);
 
         if ((v0 != 0) && (v0 != 1)) {
             ov4_021D27F4();
@@ -2290,7 +2290,7 @@ static void ov65_0222FD70(UnkStruct_ov65_0222EBE0 *param0)
 {
     TextColor v0;
     int v1, v2, v3;
-    TrainerInfo *v4 = SaveData_GetTrainerInfo(param0->unk_160);
+    TrainerInfo *v4 = SaveData_GetTrainerInfo(param0->saveData);
     Strbuf *v5 = TrainerInfo_NameNewStrbuf(v4, 54);
     u32 v6;
 
@@ -3415,7 +3415,7 @@ static int ov65_02231200(UnkStruct_ov65_0222EBE0 *param0, int param1)
 
         param0->unk_3E4 = 0;
 
-        CommInfo_Init(param0->unk_160, NULL);
+        CommInfo_Init(param0->saveData, NULL);
 
         CommInfo_SendBattleRegulation();
 
@@ -3780,15 +3780,15 @@ static BOOL ov65_02231978(UnkStruct_0207E060 *param0)
 
 static u32 ov65_022319B8(UnkStruct_ov65_0222EBE0 *param0)
 {
-    if (!Bag_HasItemsInPocket(SaveData_GetBag(param0->unk_160), 4)) {
+    if (!Bag_HasItemsInPocket(SaveData_GetBag(param0->saveData), POCKET_BERRIES)) {
         return 1;
     }
 
-    if (!Bag_GetItemQuantity(SaveData_GetBag(param0->unk_160), 449, 54)) {
+    if (!Bag_GetItemQuantity(SaveData_GetBag(param0->saveData), ITEM_POFFIN_CASE, HEAP_ID_54)) {
         return 3;
     }
 
-    if (Poffin_GetNumberOfFilledSlots(Poffin_GetSavedataBlock(param0->unk_160)) >= MAX_POFFINS) {
+    if (Poffin_GetNumberOfFilledSlots(Poffin_GetSavedataBlock(param0->saveData)) >= MAX_POFFINS) {
         return 2;
     }
 
@@ -3829,7 +3829,7 @@ static BOOL ov65_02231A54(void)
 static void ov65_02231A74(UnkStruct_ov65_0222EBE0 *param0, u32 unused)
 {
     void *journalEntryOnlineEvent;
-    JournalEntry *journalEntry = SaveData_GetJournal(param0->unk_160);
+    JournalEntry *journalEntry = SaveData_GetJournal(param0->saveData);
     journalEntryOnlineEvent = JournalEntry_CreateEventMisc(54, ONLINE_EVENT_WIFI_CLUB);
 
     JournalEntry_SaveData(journalEntry, journalEntryOnlineEvent, JOURNAL_ONLINE_EVENT);
@@ -4065,11 +4065,11 @@ static int ov65_02231E64(UnkStruct_ov65_0222EBE0 *param0, int param1)
         if (ov65_0222DD64(v0) == 0) {
             param0->unk_3A8 = 49;
             ov65_02232DFC(param0);
-            CommInfo_Init(param0->unk_160, NULL);
+            CommInfo_Init(param0->saveData, NULL);
             param0->unk_3BC = 30;
         } else if (CommSys_IsPlayerConnected(0) == 1) {
             ov65_02232DFC(param0);
-            CommInfo_Init(param0->unk_160, NULL);
+            CommInfo_Init(param0->saveData, NULL);
             CommMan_SetErrorHandling(0, 1);
             ov65_0222DFD4(v0);
 
@@ -4179,7 +4179,7 @@ static int ov65_02232028(UnkStruct_ov65_0222EBE0 *param0, int param1)
     ov65_02232DC0(param0, ov4_021D2388());
     ov65_02232B58(param0, 11, 0);
 
-    CommInfo_Init(param0->unk_160, NULL);
+    CommInfo_Init(param0->saveData, NULL);
 
     param0->unk_3A8 = 49;
     param0->unk_3BC = 30;
@@ -4327,7 +4327,7 @@ static int ov65_022323C0(UnkStruct_ov65_0222EBE0 *param0, int param1)
     if (ov65_022321A8(param0)) {
         (void)0;
     } else if (CommTiming_IsSyncState(18) && (ov65_02232390(param0) == 1)) {
-        sub_020391DC(param0->unk_160, v1, 54);
+        sub_020391DC(param0->saveData, v1, 54);
         ov65_02232DFC(param0);
 
         v2 = ov65_02234FA8(param0, ov4_021D2388());
@@ -4714,7 +4714,7 @@ static int ov65_02232B28(UnkStruct_ov65_0222EBE0 *param0, int param1)
 
 static void ov65_02232B58(UnkStruct_ov65_0222EBE0 *param0, int param1, BOOL param2)
 {
-    u8 v0 = Options_TextFrameDelay(SaveData_Options(param0->unk_160));
+    u8 v0 = Options_TextFrameDelay(SaveData_Options(param0->saveData));
 
     ov65_02232F50(param0);
 
@@ -6271,7 +6271,7 @@ static void ov65_022342A8(UnkStruct_ov65_0222EBE0 *param0, u32 heapID)
     UnkStruct_0203068C *v2;
     Strbuf *v3;
 
-    v2 = sub_0203068C(param0->unk_160);
+    v2 = sub_0203068C(param0->saveData);
     v0 = param0->unk_BE0.unk_71 - 1;
 
     {
@@ -6327,7 +6327,7 @@ static void ov65_022343CC(UnkStruct_ov65_0222EBE0 *param0, u32 param1)
 static void ov65_0223449C(UnkStruct_ov65_0222EBE0 *param0, u32 param1)
 {
     int v0;
-    UnkStruct_0202B370 *v1 = sub_0202B370(param0->unk_160);
+    UnkStruct_0202B370 *v1 = sub_0202B370(param0->saveData);
 
     v0 = param0->unk_BE0.unk_71 - 1;
 
@@ -6376,7 +6376,7 @@ static void ov65_02234628(UnkStruct_ov65_0222EBE0 *param0)
 static void ov65_02234694(UnkStruct_ov65_0222EBE0 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5)
 {
     int v0;
-    UnkStruct_0203068C *v1 = sub_0203068C(param0->unk_160);
+    UnkStruct_0203068C *v1 = sub_0203068C(param0->saveData);
     v0 = sub_02030698(v1, param2, param3);
 
     ov65_02234708(param0, param1, v0, param4, param5);
@@ -6398,7 +6398,7 @@ static void ov65_022346C4(UnkStruct_ov65_0222EBE0 *param0, Strbuf *param1, u32 p
 
     GF_ASSERT(param2 < 6);
 
-    v0 = sub_0203068C(param0->unk_160);
+    v0 = sub_0203068C(param0->saveData);
     v1 = sub_02030698(v0, v3[param2], param3);
 
     if (v1 == 0) {
diff --git a/src/overlay082/ov82_0223B2E0.c b/src/overlay082/ov82_0223B2E0.c
index 0ed44a4b1a..cefa4c58b4 100644
--- a/src/overlay082/ov82_0223B2E0.c
+++ b/src/overlay082/ov82_0223B2E0.c
@@ -101,7 +101,7 @@ static int ov82_0223B380(UnkStruct_ov83_0223C344 *param0)
         4, 0xff
     };
 
-    v0 = sub_0207D824(param0->unk_10->unk_14, v3, param0->heapID);
+    v0 = sub_0207D824(param0->unk_10->bag, v3, param0->heapID);
 
     if (param0->unk_06_0 == 1) {
         v1 = 5;
@@ -109,7 +109,7 @@ static int ov82_0223B380(UnkStruct_ov83_0223C344 *param0)
         v1 = 4;
     }
 
-    sub_0207CB2C(v0, param0->unk_10->unk_0C, v1, param0->unk_0C);
+    sub_0207CB2C(v0, param0->unk_10->saveData, v1, param0->unk_0C);
 
     param0->unk_1C = OverlayManager_New(&Unk_ov84_02241130, v0, param0->heapID);
     param0->unk_18 = v0;
@@ -151,7 +151,7 @@ static int ov82_0223B3DC(UnkStruct_ov83_0223C344 *param0)
         break;
     }
 
-    v1 = Bag_TryRemoveItem(param0->unk_10->unk_14, param0->unk_08, 1, param0->heapID);
+    v1 = Bag_TryRemoveItem(param0->unk_10->bag, param0->unk_08, 1, param0->heapID);
     GF_ASSERT(v1);
 
     return 4;
@@ -159,9 +159,9 @@ static int ov82_0223B3DC(UnkStruct_ov83_0223C344 *param0)
 
 static int ov82_0223B470(UnkStruct_ov83_0223C344 *param0)
 {
-    u8 v0;
-    u8 v1, v2, v3, v4;
-    Bag *v5 = param0->unk_10->unk_14;
+    u8 i;
+    u8 v1, v2, v3, item;
+    Bag *bag = param0->unk_10->bag;
 
     FS_EXTERN_OVERLAY(overlay85);
 
@@ -174,11 +174,11 @@ static int ov82_0223B470(UnkStruct_ov83_0223C344 *param0)
 
     v3 = 0;
 
-    for (v0 = 0; v0 < 64; v0++) {
-        v4 = Item_ForBerryNumber(v0);
+    for (i = 0; i < NUM_BERRIES; i++) {
+        item = Item_ForBerryNumber(i);
 
-        if (Bag_CanRemoveItem(v5, v4, 1, param0->heapID) == 1) {
-            sub_02097320(param0->unk_18, v4, 0);
+        if (Bag_CanRemoveItem(bag, item, 1, param0->heapID) == TRUE) {
+            sub_02097320(param0->unk_18, item, 0);
             v3++;
         }
     }
diff --git a/src/overlay083/ov83_0223B5A0.c b/src/overlay083/ov83_0223B5A0.c
index bf3f911558..c52526886d 100644
--- a/src/overlay083/ov83_0223B5A0.c
+++ b/src/overlay083/ov83_0223B5A0.c
@@ -122,14 +122,14 @@ int ov83_0223B5B0(OverlayManager *param0, int *param1)
         v1->unk_1490 = 0;
     }
 
-    ov83_0223D150(v1, v0->unk_10->unk_10);
+    ov83_0223D150(v1, v0->unk_10->trainerInfo);
 
     if (v0->unk_26) {
         sub_0203632C(1);
     }
 
-    v1->unk_24 = Options_Frame(v0->unk_10->unk_18);
-    v1->unk_28 = Options_TextFrameDelay(v0->unk_10->unk_18);
+    v1->unk_24 = Options_Frame(v0->unk_10->options);
+    v1->unk_28 = Options_TextFrameDelay(v0->unk_10->options);
     v1->unk_31C = 1;
 
     SetVBlankCallback(ov83_0223B5A0, v0);
@@ -559,7 +559,7 @@ static int ov83_0223BCEC(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78
         }
         break;
     case 3: {
-        GameRecords *v2 = SaveData_GetGameRecordsPtr(param0->unk_10->unk_0C);
+        GameRecords *v2 = SaveData_GetGameRecordsPtr(param0->unk_10->saveData);
 
         if (param1->unk_1490 == 0) {
             GameRecords_IncrementTrainerScore(v2, TRAINER_SCORE_EVENT_UNK_12);
@@ -571,7 +571,7 @@ static int ov83_0223BCEC(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78
     }
 
         if (param1->unk_1490 != 0) {
-            UnkStruct_0202B370 *v3 = sub_0202B370(param0->unk_10->unk_0C);
+            UnkStruct_0202B370 *v3 = sub_0202B370(param0->unk_10->saveData);
             int v4;
             int v5, v6;
             int v7;
@@ -580,7 +580,7 @@ static int ov83_0223BCEC(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78
             for (v4 = 0; v4 < param1->unk_1488; v4++) {
                 v5 = param1->unk_1494.unk_130[v4];
                 v8 = CommInfo_DWCFriendData(v5);
-                v6 = sub_0203909C(param0->unk_10->unk_0C, v8, &v7);
+                v6 = sub_0203909C(param0->unk_10->saveData, v8, &v7);
 
                 switch (v6) {
                 case 0:
@@ -712,14 +712,14 @@ static int ov83_0223BF74(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78
 
         if ((v0 == 1) || (v0 == 2)) {
             if (v0 == 1) {
-                if (Poffin_GetNumberOfFilledSlots(param0->unk_10->unk_08) >= MAX_POFFINS) {
+                if (Poffin_GetNumberOfFilledSlots(param0->unk_10->poffinCase) >= MAX_POFFINS) {
                     ov83_0223EC8C(&param1->unk_6A0, 2);
                     (*param2) = 10;
                     param1->unk_1C = (30 * 5);
                     break;
                 }
 
-                if (Bag_HasItemsInPocket(param0->unk_10->unk_14, 4) == 0) {
+                if (Bag_HasItemsInPocket(param0->unk_10->bag, POCKET_BERRIES) == FALSE) {
                     ov83_0223EC8C(&param1->unk_6A0, 5);
                     (*param2) = 10;
                     param1->unk_1C = (30 * 5);
@@ -798,7 +798,7 @@ static int ov83_0223C258(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78
 
             if (param1->unk_1490 == 1) {
                 journalEntryOnlineEvent = JournalEntry_CreateEventMadePoffins(param1->heapID);
-                JournalEntry_SaveData(param0->unk_10->unk_1C, journalEntryOnlineEvent, JOURNAL_ONLINE_EVENT);
+                JournalEntry_SaveData(param0->unk_10->journalEntry, journalEntryOnlineEvent, JOURNAL_ONLINE_EVENT);
             }
         }
 
@@ -1088,10 +1088,10 @@ static BOOL ov83_0223C8B0(UnkStruct_ov83_0223C344 *param0, Poffin *param1, int p
     u16 v1;
     int v2;
     BOOL v3 = 1;
-    TVBroadcast *v4 = SaveData_TVBroadcast(param0->unk_10->unk_0C);
+    TVBroadcast *v4 = SaveData_TVBroadcast(param0->unk_10->saveData);
 
     for (v0 = 0; v0 < param2; v0++) {
-        v1 = Poffin_AddToCase(param0->unk_10->unk_08, param1);
+        v1 = Poffin_AddToCase(param0->unk_10->poffinCase, param1);
 
         if (v1 == POFFIN_NONE) {
             v3 = 0;
diff --git a/src/overlay084/ov84_0223B5A0.c b/src/overlay084/ov84_0223B5A0.c
index f613164ecf..2dd66f77ea 100644
--- a/src/overlay084/ov84_0223B5A0.c
+++ b/src/overlay084/ov84_0223B5A0.c
@@ -2370,7 +2370,7 @@ static int ov84_0223DEB8(UnkStruct_ov84_0223B5A0 *param0)
 {
     ov84_0223FD84(param0);
     param0->unk_488 = 1;
-    if (Pocket_GetItemQuantity(param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_00, param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_09 - 3, param0->unk_C4->unk_66, 6) == 1) {
+    if (Pocket_GetItemQuantity(param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_00, param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_09 - 3, param0->unk_C4->unk_66, HEAP_ID_6) == 1) {
         ov84_0223FFF0(param0);
         return 8;
     }
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index f4a981b1fd..e6e158e658 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -2001,7 +2001,7 @@ static int ov88_0223D854(UnkStruct_02095E80 *param0)
         return 0;
     }
 
-    if (Bag_CanRemoveItem(SaveData_GetBag(param0->unk_04), 437, 1, 26) == 1) {
+    if (Bag_CanRemoveItem(SaveData_GetBag(param0->unk_04), ITEM_PAL_PAD, 1, HEAP_ID_26) == TRUE) {
         v1 = CommInfo_TrainerInfo(param0->unk_36C4);
         StringTemplate_SetPlayerName(param0->unk_36CC, 0, v1);
         ov88_0223D49C(param0, 57);
diff --git a/src/overlay098/ov98_02246C20.c b/src/overlay098/ov98_02246C20.c
index eca349fc59..b10edcd8ac 100644
--- a/src/overlay098/ov98_02246C20.c
+++ b/src/overlay098/ov98_02246C20.c
@@ -103,8 +103,8 @@ int ov98_02246C20(OverlayManager *param0, int *param1)
 
     v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov98_02246E88), HEAP_ID_108);
     MI_CpuClear8(v0, sizeof(UnkStruct_ov98_02246E88));
-    v0->unk_04 = ((ApplicationArgs *)OverlayManager_Args(param0))->saveData;
-    v0->unk_08 = SaveData_Options(v0->unk_04);
+    v0->saveData = ((ApplicationArgs *)OverlayManager_Args(param0))->saveData;
+    v0->unk_08 = SaveData_Options(v0->saveData);
     v0->unk_114 = Strbuf_Init(100, HEAP_ID_108);
     v0->unk_118 = Strbuf_Init(100, HEAP_ID_108);
     sub_02004550(17, 1175, 1);
@@ -273,24 +273,24 @@ void ov98_02246EF8(UnkStruct_ov98_02246E88 *param0)
     char *v0 = Heap_AllocFromHeap(HEAP_ID_108, sizeof(char) * 100);
 
     ov98_022499C8(param0->unk_114, v0, HEAP_ID_108);
-    sub_02030D38(param0->unk_04, v0);
+    sub_02030D38(param0->saveData, v0);
     Heap_FreeToHeap(v0);
 }
 
 void ov98_02246F24(UnkStruct_ov98_02246E88 *param0)
 {
-    sub_02030D5C(param0->unk_04, 1, param0->unk_7C);
-    sub_02030D5C(param0->unk_04, 2, param0->unk_10C);
+    sub_02030D5C(param0->saveData, 1, param0->unk_7C);
+    sub_02030D5C(param0->saveData, 2, param0->unk_10C);
 }
 
 void ov98_02246F48(UnkStruct_ov98_02246E88 *param0)
 {
-    sub_02030D5C(param0->unk_04, 3, param0->unk_108);
+    sub_02030D5C(param0->saveData, 3, param0->unk_108);
 }
 
 void ov98_02246F5C(UnkStruct_ov98_02246E88 *param0)
 {
-    u32 v0 = sub_02030E48(param0->unk_04, &param0->unk_9C);
+    u32 v0 = sub_02030E48(param0->saveData, &param0->unk_9C);
     ov98_02246F94(param0, v0);
 }
 
@@ -348,7 +348,7 @@ void *ov98_02246FC4(UnkStruct_ov98_02246E88 *param0)
     v0[2] = 4;
     v0[3] = 4;
 
-    param0->unk_98 = sub_02089400(HEAP_ID_108, 16, v0, SaveData_Options(param0->unk_04), 4, 0);
+    param0->unk_98 = sub_02089400(HEAP_ID_108, 16, v0, SaveData_Options(param0->saveData), 4, 0);
     return param0->unk_98;
 }
 
@@ -381,7 +381,7 @@ void *ov98_02247070(UnkStruct_ov98_02246E88 *param0)
     v0[2] = 0;
     v0[3] = 0;
 
-    param0->unk_98 = sub_0208941C(HEAP_ID_108, 7, v0, SaveData_Options(param0->unk_04), 5, 1, 1, param0->unk_7C);
+    param0->unk_98 = sub_0208941C(HEAP_ID_108, 7, v0, SaveData_Options(param0->saveData), 5, 1, 1, param0->unk_7C);
     return param0->unk_98;
 }
 
@@ -404,7 +404,7 @@ void *ov98_022470F8(UnkStruct_ov98_02246E88 *param0)
     v0[2] = 0;
     v0[3] = 0;
 
-    param0->unk_98 = sub_02089400(HEAP_ID_108, 4, v0, SaveData_Options(param0->unk_04), 6, 0);
+    param0->unk_98 = sub_02089400(HEAP_ID_108, 4, v0, SaveData_Options(param0->saveData), 6, 0);
     return param0->unk_98;
 }
 
@@ -423,7 +423,7 @@ static void *ov98_02247168(UnkStruct_ov98_02246E88 *param0)
     UnkStruct_ov98_02247168 *v0 = Heap_AllocFromHeap(HEAP_ID_108, sizeof(UnkStruct_ov98_02247168));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov98_02247168));
 
-    v0->unk_00 = param0->unk_04;
+    v0->saveData = param0->saveData;
     v0->unk_04 = 1;
 
     param0->unk_80 = 0;
@@ -436,8 +436,8 @@ static void ov98_02247198(UnkStruct_ov98_02246E88 *param0)
 {
     UnkStruct_ov98_02247168 *v0 = param0->unk_98;
 
-    if (sub_02039074(param0->unk_04)) {
-        SystemFlag_SetConnectedToWiFi(SaveData_GetVarsFlags(param0->unk_04));
+    if (sub_02039074(param0->saveData)) {
+        SystemFlag_SetConnectedToWiFi(SaveData_GetVarsFlags(param0->saveData));
     }
 
     Heap_FreeToHeap(param0->unk_98);
diff --git a/src/overlay098/ov98_022471C8.c b/src/overlay098/ov98_022471C8.c
index 4141736863..e230546fef 100644
--- a/src/overlay098/ov98_022471C8.c
+++ b/src/overlay098/ov98_022471C8.c
@@ -324,9 +324,9 @@ int ov98_022471C8(OverlayManager *param0, int *param1)
 
     switch (ov98_02246EA4(v0->unk_00)) {
     case 12:
-        if (!DWC_CheckInet() && (sub_02039074(v0->unk_00->unk_04) == 1)) {
+        if (!DWC_CheckInet() && (sub_02039074(v0->unk_00->saveData) == 1)) {
             v0->unk_08 = 12;
-            sub_02038548(v0->unk_00->unk_04);
+            sub_02038548(v0->unk_00->saveData);
             sub_02039734();
         } else {
             v0->unk_08 = 0;
@@ -726,7 +726,7 @@ static int ov98_02247B98(UnkStruct_ov98_02247704 *param0)
         const UnkStruct_ov98_02249BDC *v4;
         int v5;
 
-        if (sub_02030D20(param0->unk_00->unk_04) == 1) {
+        if (sub_02030D20(param0->unk_00->saveData) == 1) {
             v3 = Unk_ov98_02249BC0;
             v4 = Unk_ov98_02249BEC;
             v5 = (NELEMS(Unk_ov98_02249BEC));
@@ -819,10 +819,10 @@ static int ov98_02247D50(UnkStruct_ov98_02247704 *param0)
         if (v0 != 0xffffffff) {
             if (v0 == 0xfffffffe) {
                 ov98_02249714(param0, param0->unk_34, 27, TEXT_SPEED_FAST, 0xf0f);
-                sub_02030D5C(param0->unk_00->unk_04, 0, 0);
+                sub_02030D5C(param0->unk_00->saveData, 0, 0);
             } else {
                 ov98_02249714(param0, param0->unk_34, 26, TEXT_SPEED_FAST, 0xf0f);
-                sub_02030D5C(param0->unk_00->unk_04, 0, 1);
+                sub_02030D5C(param0->unk_00->saveData, 0, 1);
             }
 
             param0->unk_94++;
@@ -859,7 +859,7 @@ static int ov98_02247E38(UnkStruct_ov98_02247704 *param0)
                 param0->unk_08 = 0;
             } else {
                 ov98_02249714(param0, param0->unk_34, 29, TEXT_SPEED_FAST, 0xf0f);
-                sub_02030D10(param0->unk_00->unk_04);
+                sub_02030D10(param0->unk_00->saveData);
                 param0->unk_94++;
             }
         }
@@ -1469,7 +1469,7 @@ static int ov98_02248804(UnkStruct_ov98_02247704 *param0)
         }
     } break;
     case 4:
-        if (sub_02039074(param0->unk_00->unk_04) == 0) {
+        if (sub_02039074(param0->unk_00->saveData) == 0) {
             ov98_02246E88(param0->unk_00, 5, 0);
             ov98_02246E9C(param0->unk_00, 12);
             param0->unk_08 = 29;
@@ -1541,7 +1541,7 @@ static int ov98_022489DC(UnkStruct_ov98_02247704 *param0)
 {
     switch (param0->unk_94) {
     case 0:
-        sub_02038548(param0->unk_00->unk_04);
+        sub_02038548(param0->unk_00->saveData);
         sub_02039734();
         ov98_02249714(param0, param0->unk_2C, 1, TEXT_SPEED_FAST, 0xf0f);
         ov98_02247AF0(param0);
@@ -1708,8 +1708,8 @@ static int ov98_02248BFC(UnkStruct_ov98_02247704 *param0)
     DWCUserData *v0;
     s32 v1;
     SystemData *v2;
-    UnkStruct_0202B370 *v3 = sub_0202B370(param0->unk_00->unk_04);
-    v2 = SaveData_GetSystemData(param0->unk_00->unk_04);
+    UnkStruct_0202B370 *v3 = sub_0202B370(param0->unk_00->saveData);
+    v2 = SaveData_GetSystemData(param0->unk_00->saveData);
     v0 = sub_0202AD28(v3);
     v1 = sub_02025D74(v2);
 
@@ -2071,10 +2071,10 @@ static int ov98_02249238(UnkStruct_ov98_02247704 *param0)
     case 1: {
         int v0;
 
-        v0 = SaveData_Save(param0->unk_00->unk_04);
+        v0 = SaveData_Save(param0->unk_00->saveData);
 
         if (v0 == 2) {
-            StringTemplate_SetPlayerName(param0->unk_20, 0, SaveData_GetTrainerInfo(param0->unk_00->unk_04));
+            StringTemplate_SetPlayerName(param0->unk_20, 0, SaveData_GetTrainerInfo(param0->unk_00->saveData));
             ov98_02249714(param0, param0->unk_34, 33, TEXT_SPEED_INSTANT, 0xf0f);
             Sound_PlayEffect(SEQ_SE_DP_SAVE);
         } else {
@@ -2404,8 +2404,8 @@ static int ov98_022497F8(UnkStruct_ov98_02247704 *param0)
 
     switch (param0->unk_94) {
     case 0:
-        if (ov98_02246FA4(v0) == sub_02030D98(v0->unk_04, 3)) {
-            ov98_02249ACC(sub_02030D50(v0->unk_04), v2, 108);
+        if (ov98_02246FA4(v0) == sub_02030D98(v0->saveData, 3)) {
+            ov98_02249ACC(sub_02030D50(v0->saveData), v2, 108);
             for (v3 = 0; v3 < 4; v3++) {
                 StringTemplate_SetNumber(param0->unk_20, v3, v2[v3], 4, 2, 1);
             }
diff --git a/src/overlay104/ov104_0222FBE4.c b/src/overlay104/ov104_0222FBE4.c
index 9a10aa75cc..4698d02241 100644
--- a/src/overlay104/ov104_0222FBE4.c
+++ b/src/overlay104/ov104_0222FBE4.c
@@ -1048,7 +1048,7 @@ static BOOL ov104_022302E8(UnkStruct_ov104_0222E930 *param0)
             UnkStruct_ov104_02230BE4 *v6;
 
             v6 = sub_0209B970(v0->unk_00);
-            v5 = SaveData_GetTrainerInfo(v6->unk_08);
+            v5 = SaveData_GetTrainerInfo(v6->saveData);
             v3.unk_00 = ov104_0222E5F0(v5);
 
             ov104_0223D0EC(v1, &v3);
@@ -1121,7 +1121,7 @@ static BOOL ov104_022303C8(UnkStruct_ov104_0222E930 *param0)
             UnkStruct_ov104_02230BE4 *v7;
 
             v7 = sub_0209B970(v0->unk_00);
-            v6 = SaveData_GetTrainerInfo(v7->unk_08);
+            v6 = SaveData_GetTrainerInfo(v7->saveData);
             v4.unk_00 = ov104_0222E5F0(v6);
             v5 = (32 - 1);
         } else if (v4.unk_00 == 0xeeef) {
@@ -1453,7 +1453,7 @@ static BOOL ov104_02230910(UnkStruct_ov104_0222E930 *param0)
 {
     void *v0;
     UnkStruct_ov104_02230BE4 *v1 = sub_0209B970(param0->unk_00->unk_00);
-    v0 = sub_0208712C(HEAP_ID_FIELDMAP, 0, 0, 8, (void *)v1->unk_04);
+    v0 = sub_0208712C(HEAP_ID_FIELDMAP, 0, 0, 8, (void *)v1->options);
 
     sub_0209B988(param0->unk_00->unk_00, &Unk_020F2DAC, v0, 0, ov104_02230950);
 
@@ -1470,7 +1470,7 @@ static BOOL ov104_02230958(UnkStruct_ov104_0222E930 *param0)
     int v0;
     UnkStruct_ov104_02230BE4 *v1 = sub_0209B970(param0->unk_00->unk_00);
 
-    sub_0202F1F8(v1->unk_08, 11, &v0);
+    sub_0202F1F8(v1->saveData, HEAP_ID_FIELDMAP, &v0);
     return 0;
 }
 
@@ -1500,7 +1500,7 @@ static BOOL ov104_022309DC(UnkStruct_ov104_0222E930 *param0)
 {
     UnkStruct_ov104_022320B4 *v0 = param0->unk_00;
     UnkStruct_ov104_02230BE4 *v1 = sub_0209B970(param0->unk_00->unk_00);
-    int v2 = sub_0202F41C(v1->unk_08, v0->unk_B4, v0->unk_B6, 0, &v0->unk_B0, &v0->unk_B2);
+    int v2 = sub_0202F41C(v1->saveData, v0->unk_B4, v0->unk_B6, 0, &v0->unk_B0, &v0->unk_B2);
 
     if ((v2 == 2) || (v2 == 3)) {
         if (v2 == 2) {
@@ -1641,7 +1641,7 @@ static BOOL ov104_02230B50(UnkStruct_ov104_0222E930 *param0)
     v1 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(FieldBattleDTO));
     MI_CpuClear8(v1, sizeof(FieldBattleDTO));
 
-    sub_0202F298(v2->unk_08, 11, &v0, v1, 0);
+    sub_0202F298(v2->saveData, 11, &v0, v1, 0);
     sub_02004550(5, 1119, 1);
     sub_0209B988(param0->unk_00->unk_00, &gBattleOverlayTemplate, v1, 1, NULL);
 
@@ -1660,7 +1660,7 @@ static BOOL ov104_02230BBC(UnkStruct_ov104_0222E930 *param0)
     UnkStruct_ov104_02230BE4 *v1 = sub_0209B970(param0->unk_00->unk_00);
     u16 *v2 = ov104_0222FBE4(param0);
 
-    *v2 = sub_0202F330(v1->unk_08, 11, &v0, 0);
+    *v2 = sub_0202F330(v1->saveData, 11, &v0, 0);
     return 0;
 }
 
@@ -1669,7 +1669,7 @@ static BOOL ov104_02230BE4(UnkStruct_ov104_0222E930 *param0)
     UnkStruct_ov104_02230BE4 *v0 = sub_0209B970(param0->unk_00->unk_00);
     u16 *v1 = ov104_0222FBE4(param0);
 
-    if (SaveData_Save(v0->unk_08) == 2) {
+    if (SaveData_Save(v0->saveData) == 2) {
         (void)0;
     } else {
         (void)0;
@@ -1686,7 +1686,7 @@ static BOOL ov104_02230C04(UnkStruct_ov104_0222E930 *param0)
 
     ResetLock(RESET_LOCK_SOFT_RESET);
     InitHeapCanary(v0->heapID);
-    SaveData_SaveStateInit(v1->unk_08, 2);
+    SaveData_SaveStateInit(v1->saveData, 2);
 
     ov104_0222E974(param0, ov104_02230C3C);
     return 1;
@@ -1697,7 +1697,7 @@ static BOOL ov104_02230C3C(UnkStruct_ov104_0222E930 *param0)
     int v0;
     UnkStruct_ov104_02230BE4 *v1 = sub_0209B970(param0->unk_00->unk_00);
 
-    v0 = SaveData_SaveStateMain(v1->unk_08);
+    v0 = SaveData_SaveStateMain(v1->saveData);
 
     if (v0 == 2) {
         FreeHeapCanary();
@@ -1718,7 +1718,7 @@ static BOOL ov104_02230C74(UnkStruct_ov104_0222E930 *param0)
 {
     UnkStruct_ov104_02230BE4 *v0 = sub_0209B970(param0->unk_00->unk_00);
 
-    SaveDataExtra_Init(v0->unk_08);
+    SaveDataExtra_Init(v0->saveData);
     return 0;
 }
 
@@ -1727,7 +1727,7 @@ static BOOL ov104_02230C88(UnkStruct_ov104_0222E930 *param0)
     UnkStruct_ov104_02230BE4 *v0 = sub_0209B970(param0->unk_00->unk_00);
     u16 *v1 = ov104_0222FBE4(param0);
 
-    *v1 = SaveData_MiscSaveBlock_InitFlag(v0->unk_08);
+    *v1 = SaveData_MiscSaveBlock_InitFlag(v0->saveData);
     return 0;
 }
 
@@ -1793,7 +1793,7 @@ static BOOL ov104_02230DC4(UnkStruct_ov104_0222E930 *param0)
     UnkStruct_ov104_02230BE4 *v0 = sub_0209B970(param0->unk_00->unk_00);
     u8 v1 = (*((param0)->unk_1C++));
 
-    StringTemplate_SetPlayerName(param0->unk_00->unk_44, v1, SaveData_GetTrainerInfo(v0->unk_08));
+    StringTemplate_SetPlayerName(param0->unk_00->unk_44, v1, SaveData_GetTrainerInfo(v0->saveData));
     return 0;
 }
 
@@ -1855,7 +1855,7 @@ static BOOL ov104_02230ED8(UnkStruct_ov104_0222E930 *param0)
     UnkStruct_ov104_02230BE4 *v0 = sub_0209B970(param0->unk_00->unk_00);
     u8 v1 = (*((param0)->unk_1C++));
 
-    StringTemplate_SetRivalName(param0->unk_00->unk_44, v1, v0->unk_08);
+    StringTemplate_SetRivalName(param0->unk_00->unk_44, v1, v0->saveData);
     return 0;
 }
 
@@ -1864,7 +1864,7 @@ static BOOL ov104_02230EFC(UnkStruct_ov104_0222E930 *param0)
     UnkStruct_ov104_02230BE4 *v0 = sub_0209B970(param0->unk_00->unk_00);
     u16 *v1 = ov104_0222FBE4(param0);
 
-    *v1 = sub_0202D230(sub_0202D750(v0->unk_08), 0, 0);
+    *v1 = sub_0202D230(sub_0202D750(v0->saveData), 0, 0);
     return 0;
 }
 
@@ -1874,11 +1874,11 @@ static BOOL ov104_02230F28(UnkStruct_ov104_0222E930 *param0)
     UnkStruct_ov104_02230BE4 *v1 = sub_0209B970(param0->unk_00->unk_00);
     u16 v2 = ov104_0222FC00(param0);
 
-    v0 = SaveData_TVBroadcast(v1->unk_08);
+    v0 = SaveData_TVBroadcast(v1->saveData);
 
     sub_0206D0C8(v0, v2);
-    GameRecords_AddToRecordValue(SaveData_GetGameRecordsPtr(v1->unk_08), RECORD_UNK_068, v2);
-    sub_0202D230(sub_0202D750(v1->unk_08), v2, 5);
+    GameRecords_AddToRecordValue(SaveData_GetGameRecordsPtr(v1->saveData), RECORD_UNK_068, v2);
+    sub_0202D230(sub_0202D750(v1->saveData), v2, 5);
 
     return 0;
 }
@@ -1888,8 +1888,8 @@ static BOOL ov104_02230F6C(UnkStruct_ov104_0222E930 *param0)
     UnkStruct_ov104_02230BE4 *v0 = sub_0209B970(param0->unk_00->unk_00);
     u16 v1 = ov104_0222FC00(param0);
 
-    GameRecords_AddToRecordValue(SaveData_GetGameRecordsPtr(v0->unk_08), RECORD_UNK_069, v1);
-    sub_0202D230(sub_0202D750(v0->unk_08), v1, 6);
+    GameRecords_AddToRecordValue(SaveData_GetGameRecordsPtr(v0->saveData), RECORD_UNK_069, v1);
+    sub_0202D230(sub_0202D750(v0->saveData), v1, 6);
 
     return 0;
 }
@@ -1957,7 +1957,7 @@ static BOOL ov104_02231050(UnkStruct_ov104_0222E930 *param0)
 {
     UnkStruct_ov104_02230BE4 *v0 = sub_0209B970(param0->unk_00->unk_00);
 
-    HealAllPokemonInParty(Party_GetFromSavedata(v0->unk_08));
+    HealAllPokemonInParty(Party_GetFromSavedata(v0->saveData));
     return 0;
 }
 
@@ -2012,7 +2012,7 @@ BOOL ov104_022310EC(UnkStruct_ov104_0222E930 *param0)
     u16 v2 = ov104_0222FC00(param0);
     UnkStruct_ov104_02230BE4 *v3 = sub_0209B970(param0->unk_00->unk_00);
 
-    v0 = VarsFlags_GetVarAddress(SaveData_GetVarsFlags(v3->unk_08), v1);
+    v0 = VarsFlags_GetVarAddress(SaveData_GetVarsFlags(v3->saveData), v1);
     *v0 = v2;
 
     return 0;
@@ -2025,7 +2025,7 @@ BOOL ov104_02231118(UnkStruct_ov104_0222E930 *param0)
     u16 *v2 = ov104_0222FBE4(param0);
     UnkStruct_ov104_02230BE4 *v3 = sub_0209B970(param0->unk_00->unk_00);
 
-    v0 = VarsFlags_GetVarAddress(SaveData_GetVarsFlags(v3->unk_08), v1);
+    v0 = VarsFlags_GetVarAddress(SaveData_GetVarsFlags(v3->saveData), v1);
     *v2 = *v0;
 
     return 0;
@@ -2517,7 +2517,7 @@ static BOOL ov104_02231AF4(UnkStruct_ov104_0222E930 *param0)
 
     v1 = sub_0209B970(param0->unk_00->unk_00);
 
-    if (TrainerInfo_Gender(SaveData_GetTrainerInfo(v1->unk_08)) == 0) {
+    if (TrainerInfo_Gender(SaveData_GetTrainerInfo(v1->saveData)) == 0) {
         v0 = 0x0;
     } else {
         v0 = 0x61;
@@ -2694,7 +2694,7 @@ static BOOL ov104_02231D1C(UnkStruct_ov104_0222E930 *param0)
     u16 v9 = ov104_0222EA48(param0);
 
     v2 = sub_0209B970(param0->unk_00->unk_00);
-    v0 = Party_GetFromSavedata(v2->unk_08);
+    v0 = Party_GetFromSavedata(v2->saveData);
     v1 = Party_GetPokemonBySlotIndex(v0, v4);
     v8 = 8;
     v9 = (GX_RGB(0, 0, 0));
@@ -2744,7 +2744,7 @@ static BOOL ov104_02231E30(UnkStruct_ov104_0222E930 *param0)
     u16 v1 = ov104_0222EA48(param0);
 
     v0 = sub_0209B970(param0->unk_00->unk_00);
-    GameRecords_IncrementRecordValue(SaveData_GetGameRecordsPtr(v0->unk_08), v1);
+    GameRecords_IncrementRecordValue(SaveData_GetGameRecordsPtr(v0->saveData), v1);
 
     return 0;
 }
@@ -2756,7 +2756,7 @@ static BOOL ov104_02231E54(UnkStruct_ov104_0222E930 *param0)
     u16 v2 = ov104_0222FC00(param0);
 
     v0 = sub_0209B970(param0->unk_00->unk_00);
-    GameRecords_AddToRecordValue(SaveData_GetGameRecordsPtr(v0->unk_08), v1, v2);
+    GameRecords_AddToRecordValue(SaveData_GetGameRecordsPtr(v0->saveData), v1, v2);
 
     return 0;
 }
@@ -2767,7 +2767,7 @@ static BOOL ov104_02231E80(UnkStruct_ov104_0222E930 *param0)
     u16 v1 = ov104_0222EA48(param0);
 
     v0 = sub_0209B970(param0->unk_00->unk_00);
-    GameRecords_IncrementTrainerScore(SaveData_GetGameRecordsPtr(v0->unk_08), v1);
+    GameRecords_IncrementTrainerScore(SaveData_GetGameRecordsPtr(v0->saveData), v1);
 
     return 0;
 }
@@ -2778,7 +2778,7 @@ static BOOL ov104_02231EA4(UnkStruct_ov104_0222E930 *param0)
     u16 *v1 = ov104_0222FBE4(param0);
 
     v0 = sub_0209B970(param0->unk_00->unk_00);
-    *v1 = sub_0205E6D8(v0->unk_08);
+    *v1 = sub_0205E6D8(v0->saveData);
 
     return 0;
 }
@@ -2795,7 +2795,7 @@ static BOOL ov104_02231ED8(UnkStruct_ov104_0222E930 *param0)
 {
     UnkStruct_0202B370 *v0;
     UnkStruct_ov104_02230BE4 *v1 = sub_0209B970(param0->unk_00->unk_00);
-    v0 = sub_0202B370(v1->unk_08);
+    v0 = sub_0202B370(v1->saveData);
 
     sub_0202B13C(v0, ov4_021D2388());
     return 0;
@@ -2807,7 +2807,7 @@ static BOOL ov104_02231EFC(UnkStruct_ov104_0222E930 *param0)
     TVBroadcast *v1;
     TrainerInfo *v2;
     UnkStruct_ov104_02230BE4 *v3 = sub_0209B970(param0->unk_00->unk_00);
-    v1 = SaveData_TVBroadcast(v3->unk_08);
+    v1 = SaveData_TVBroadcast(v3->saveData);
     v0 = ov104_0222FC00(param0);
     v2 = CommInfo_TrainerInfo(1 - CommSys_CurNetId());
 
diff --git a/src/overlay104/ov104_02231F74.c b/src/overlay104/ov104_02231F74.c
index fed84a0d1a..5b0701b575 100644
--- a/src/overlay104/ov104_02231F74.c
+++ b/src/overlay104/ov104_02231F74.c
@@ -144,7 +144,7 @@ void ov104_02231F74(UnkStruct_ov104_022320B4 *param0, const MessageLoader *param
 
         v4 = sub_0209B970(v3->unk_08);
 
-        v0 = Options_TextFrameDelay(v4->unk_04);
+        v0 = Options_TextFrameDelay(v4->options);
         v1 = 0;
         v2 = FONT_MESSAGE;
     } else {
@@ -1076,7 +1076,7 @@ void ov104_0223310C(UnkStruct_ov104_0222E930 *param0, u16 *param1, u32 param2)
         ov104_02231F74(param0->unk_00, v1, param1[1], 1, NULL);
         MessageLoader_Free(v1);
     } else {
-        v0 = Options_TextFrameDelay(SaveData_Options(v2->unk_08));
+        v0 = Options_TextFrameDelay(SaveData_Options(v2->saveData));
         ov104_022320B4(param0->unk_00, v0, param1[0], param1[1], param1[2], param1[3], 1);
     }
 
diff --git a/src/overlay104/ov104_022332B4.c b/src/overlay104/ov104_022332B4.c
index 4c9c301832..72881e56c2 100644
--- a/src/overlay104/ov104_022332B4.c
+++ b/src/overlay104/ov104_022332B4.c
@@ -65,7 +65,7 @@ BOOL ov104_022332B4(UnkStruct_ov104_0222E930 *param0)
     u16 v4 = ov104_0222FC00(param0);
 
     v1 = sub_0209B970(param0->unk_00->unk_00);
-    v0 = ov104_022339B4(v1->unk_08, v2, v3, v4);
+    v0 = ov104_022339B4(v1->saveData, v2, v3, v4);
 
     sub_0209B980(param0->unk_00->unk_00, v0);
 
@@ -112,7 +112,7 @@ BOOL ov104_02233324(UnkStruct_ov104_0222E930 *param0)
 
     MI_CpuClear8(v2, sizeof(UnkStruct_ov104_02234130));
 
-    v2->unk_00 = v3->unk_08;
+    v2->unk_00 = v3->saveData;
     v2->unk_04 = v1->unk_04;
     v2->unk_05 = v1->unk_05;
     v2->unk_06 = 0;
@@ -178,7 +178,7 @@ BOOL ov104_022333F8(UnkStruct_ov104_0222E930 *param0)
     v2 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov104_02234130));
     MI_CpuClear8(v2, sizeof(UnkStruct_ov104_02234130));
 
-    v2->unk_00 = v3->unk_08;
+    v2->unk_00 = v3->saveData;
     v2->unk_04 = v1->unk_04;
     v2->unk_05 = v1->unk_05;
     v2->unk_06 = 1;
diff --git a/src/overlay104/ov104_02234838.c b/src/overlay104/ov104_02234838.c
index 4d5f11cc72..b9581b0645 100644
--- a/src/overlay104/ov104_02234838.c
+++ b/src/overlay104/ov104_02234838.c
@@ -61,7 +61,7 @@ BOOL ov104_02234838(UnkStruct_ov104_0222E930 *param0)
     u16 v5 = ov104_0222FC00(param0);
 
     v1 = sub_0209B970(param0->unk_00->unk_00);
-    v0 = ov104_02234DB4(v1->unk_08, v2, v3, v4, v5);
+    v0 = ov104_02234DB4(v1->saveData, v2, v3, v4, v5);
 
     sub_0209B980(param0->unk_00->unk_00, v0);
 
@@ -110,7 +110,7 @@ BOOL ov104_022348BC(UnkStruct_ov104_0222E930 *param0)
 
     MI_CpuClear8(v4, sizeof(UnkStruct_ov104_02235208));
 
-    v4->unk_00 = v5->unk_08;
+    v4->unk_00 = v5->saveData;
     v4->unk_04 = v3->unk_04;
     v4->unk_10 = v3;
     v4->unk_08 = &v3->unk_704[v3->unk_04][0];
@@ -121,7 +121,7 @@ BOOL ov104_022348BC(UnkStruct_ov104_0222E930 *param0)
 
     Party_Init(v4->unk_0C);
 
-    v1 = Party_GetFromSavedata(v5->unk_08);
+    v1 = Party_GetFromSavedata(v5->saveData);
     v2 = Party_GetPokemonBySlotIndex(v1, v3->unk_260[0]);
 
     Party_AddPokemon(v4->unk_0C, v2);
@@ -247,7 +247,7 @@ BOOL ov104_02234A1C(UnkStruct_ov104_0222E930 *param0)
         *v11 = v3->unk_D88;
         break;
     case 27:
-        v2 = Party_GetFromSavedata(v0->unk_08);
+        v2 = Party_GetFromSavedata(v0->saveData);
         v5 = ov104_0223B500(v3->unk_04);
 
         for (v7 = 0; v7 < v5; v7++) {
@@ -289,7 +289,7 @@ BOOL ov104_02234A1C(UnkStruct_ov104_0222E930 *param0)
         *v11 = ov104_02235578(v3);
         break;
     case 15:
-        v2 = Party_GetFromSavedata(v0->unk_08);
+        v2 = Party_GetFromSavedata(v0->saveData);
         v1 = Party_GetPokemonBySlotIndex(v2, v3->unk_260[0]);
         *v11 = Pokemon_GetValue(v1, MON_DATA_SPECIES, NULL);
         break;
@@ -406,12 +406,12 @@ BOOL ov104_02234D6C(UnkStruct_ov104_0222E930 *param0)
     UnkStruct_ov104_02230BE4 *v5 = sub_0209B970(param0->unk_00->unk_00);
 
     v4 = sub_0209B978(param0->unk_00->unk_00);
-    v2 = Party_GetFromSavedata(v5->unk_08);
+    v2 = Party_GetFromSavedata(v5->saveData);
     v3 = Party_GetPokemonBySlotIndex(v2, v4->unk_260[0]);
     v1 = Pokemon_GetValue(v3, MON_DATA_SPECIES, NULL);
 
     if (v4->unk_04 == 0) {
-        v0 = SaveData_TVBroadcast(v5->unk_08);
+        v0 = SaveData_TVBroadcast(v5->saveData);
         sub_0206D048(v0, v3);
     }
 
diff --git a/src/overlay104/ov104_022358E8.c b/src/overlay104/ov104_022358E8.c
index b2f733ad96..21e9d324f2 100644
--- a/src/overlay104/ov104_022358E8.c
+++ b/src/overlay104/ov104_022358E8.c
@@ -75,7 +75,7 @@ BOOL ov104_022358E8(UnkStruct_ov104_0222E930 *param0)
     u16 *v7 = ov104_0222FBE4(param0);
 
     v1 = sub_0209B970(param0->unk_00->unk_00);
-    v0 = ov104_022361B4(v1->unk_08, v2, v3, v4, v5, v6, v7);
+    v0 = ov104_022361B4(v1->saveData, v2, v3, v4, v5, v6, v7);
 
     sub_0209B980(param0->unk_00->unk_00, v0);
 
@@ -121,7 +121,7 @@ BOOL ov104_0223597C(UnkStruct_ov104_0222E930 *param0)
     v2 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov104_0223597C));
 
     MI_CpuClear8(v2, sizeof(UnkStruct_ov104_0223597C));
-    v2->unk_00 = v3->unk_08;
+    v2->unk_00 = v3->saveData;
 
     ov104_02235B3C(v2, v1);
     sub_0209B988(param0->unk_00->unk_00, &v4, v2, 0, ov104_02235B84);
@@ -149,7 +149,7 @@ BOOL ov104_022359D0(UnkStruct_ov104_0222E930 *param0)
     v2 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov104_0223597C));
 
     MI_CpuClear8(v2, sizeof(UnkStruct_ov104_0223597C));
-    v2->unk_00 = v3->unk_08;
+    v2->unk_00 = v3->saveData;
 
     ov104_02235B3C(v2, v1);
     sub_0209B988(param0->unk_00->unk_00, &v4, v2, 0, ov104_02235B84);
@@ -225,7 +225,7 @@ BOOL ov104_02235AE8(UnkStruct_ov104_0222E930 *param0)
     v2 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov104_0223597C));
 
     MI_CpuClear8(v2, sizeof(UnkStruct_ov104_0223597C));
-    v2->unk_00 = v3->unk_08;
+    v2->unk_00 = v3->saveData;
 
     ov104_02235B3C(v2, v1);
     sub_0209B988(param0->unk_00->unk_00, &v4, v2, 0, ov104_02235B84);
@@ -335,7 +335,7 @@ BOOL ov104_02235BC0(UnkStruct_ov104_0222E930 *param0)
         *v17 = v3->unk_288[v15].unk_04[v16];
         break;
     case 18:
-        v2 = Party_GetFromSavedata(v11->unk_08);
+        v2 = Party_GetFromSavedata(v11->saveData);
 
         for (v8 = 0; v8 < 3; v8++) {
             v1 = Party_GetPokemonBySlotIndex(v2, v3->unk_24[v8]);
@@ -402,7 +402,7 @@ BOOL ov104_02235BC0(UnkStruct_ov104_0222E930 *param0)
         }
 
         if (v10 == 1) {
-            ov104_0223BC2C(sub_0203068C(v11->unk_08), v3->unk_10, 50);
+            ov104_0223BC2C(sub_0203068C(v11->saveData), v3->unk_10, 50);
         } else {
             v3->unk_A1C -= 50;
         }
@@ -443,9 +443,9 @@ BOOL ov104_02235BC0(UnkStruct_ov104_0222E930 *param0)
         *v17 = ov104_02237338(v3);
         break;
     case 39:
-        *v17 = (u16)sub_02030470(sub_0203041C(v11->unk_08), 10, 0, 0, NULL);
+        *v17 = (u16)sub_02030470(sub_0203041C(v11->saveData), 10, 0, 0, NULL);
         v13[0] = 1;
-        sub_02030430(sub_0203041C(v11->unk_08), 10, 0, 0, v13);
+        sub_02030430(sub_0203041C(v11->saveData), 10, 0, 0, v13);
         break;
     case 40:
         *v17 = 0;
@@ -471,10 +471,10 @@ BOOL ov104_02235BC0(UnkStruct_ov104_0222E930 *param0)
     case 44:
         if (v3->unk_10 == 3) {
             if (v15 == 0) {
-                v3->unk_22 = sub_02030698(sub_0203068C(v11->unk_08), sub_0205E630(v3->unk_10), sub_0205E6A8(sub_0205E630(v3->unk_10)));
-                sub_020306E4(sub_0203068C(v11->unk_08), sub_0205E630(v3->unk_10), sub_0205E6A8(sub_0205E630(v3->unk_10)), v3->unk_20);
+                v3->unk_22 = sub_02030698(sub_0203068C(v11->saveData), sub_0205E630(v3->unk_10), sub_0205E6A8(sub_0205E630(v3->unk_10)));
+                sub_020306E4(sub_0203068C(v11->saveData), sub_0205E630(v3->unk_10), sub_0205E6A8(sub_0205E630(v3->unk_10)), v3->unk_20);
             } else {
-                sub_020306E4(sub_0203068C(v11->unk_08), sub_0205E630(v3->unk_10), sub_0205E6A8(sub_0205E630(v3->unk_10)), v3->unk_22);
+                sub_020306E4(sub_0203068C(v11->saveData), sub_0205E630(v3->unk_10), sub_0205E6A8(sub_0205E630(v3->unk_10)), v3->unk_22);
             }
         }
         break;
@@ -590,7 +590,7 @@ BOOL ov104_022360D8(UnkStruct_ov104_0222E930 *param0)
     u16 *v2 = ov104_0222FBE4(param0);
 
     v0 = sub_0209B970(param0->unk_00->unk_00);
-    *v2 = sub_02030698(sub_0203068C(v0->unk_08), sub_0205E630(v1), sub_0205E6A8(sub_0205E630(v1)));
+    *v2 = sub_02030698(sub_0203068C(v0->saveData), sub_0205E630(v1), sub_0205E6A8(sub_0205E630(v1)));
 
     return 0;
 }
@@ -602,7 +602,7 @@ BOOL ov104_02236120(UnkStruct_ov104_0222E930 *param0)
     u16 v2 = ov104_0222FC00(param0);
 
     v0 = sub_0209B970(param0->unk_00->unk_00);
-    ov104_0223BC2C(sub_0203068C(v0->unk_08), v1, v2);
+    ov104_0223BC2C(sub_0203068C(v0->saveData), v1, v2);
 
     return 0;
 }
@@ -615,7 +615,7 @@ BOOL ov104_02236150(UnkStruct_ov104_0222E930 *param0)
     u16 v3 = ov104_0222FC00(param0);
 
     v1 = sub_0209B970(param0->unk_00->unk_00);
-    ov104_02236ED8(v1->unk_08, v2, v3);
+    ov104_02236ED8(v1->saveData, v2, v3);
 
     return 0;
 }
diff --git a/src/overlay104/ov104_02237378.c b/src/overlay104/ov104_02237378.c
index c378c082b5..5d9f5ba880 100644
--- a/src/overlay104/ov104_02237378.c
+++ b/src/overlay104/ov104_02237378.c
@@ -86,7 +86,7 @@ BOOL ov104_02237378(UnkStruct_ov104_0222E930 *param0)
     u16 *v7 = ov104_0222FBE4(param0);
 
     v1 = sub_0209B970(param0->unk_00->unk_00);
-    v0 = ov104_02237DD8(v1->unk_08, v2, v3, v4, v5, v6, v7);
+    v0 = ov104_02237DD8(v1->saveData, v2, v3, v4, v5, v6, v7);
 
     sub_0209B980(param0->unk_00->unk_00, v0);
     return 0;
@@ -131,7 +131,7 @@ BOOL ov104_0223740C(UnkStruct_ov104_0222E930 *param0)
     v2 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov104_02238240));
 
     MI_CpuClear8(v2, sizeof(UnkStruct_ov104_02238240));
-    v2->unk_00 = v3->unk_08;
+    v2->unk_00 = v3->saveData;
 
     ov104_02237634(v2, v1);
     sub_0209B988(param0->unk_00->unk_00, &v4, v2, 0, ov104_0223770C);
@@ -362,7 +362,7 @@ BOOL ov104_02237748(UnkStruct_ov104_0222E930 *param0)
         *v20 = v3->unk_13;
         break;
     case 18:
-        v2 = Party_GetFromSavedata(v14->unk_08);
+        v2 = Party_GetFromSavedata(v14->saveData);
 
         for (v11 = 0; v11 < 3; v11++) {
             v1 = Party_GetPokemonBySlotIndex(v2, v3->unk_2C[v11]);
@@ -481,7 +481,7 @@ BOOL ov104_02237748(UnkStruct_ov104_0222E930 *param0)
             StringTemplate_SetFrontierTrainerName(param0->unk_00->unk_44, v18, v3->unk_78[ov104_02238498(v3, v19)]);
         } else {
             if (ov104_0223C000(v3->unk_10) == 0) {
-                v16 = SaveData_GetTrainerInfo(v14->unk_08);
+                v16 = SaveData_GetTrainerInfo(v14->saveData);
             } else {
                 v16 = CommInfo_TrainerInfo(v19);
             }
diff --git a/src/overlay104/ov104_02239130.c b/src/overlay104/ov104_02239130.c
index a937fe639f..5cd0a9c6e1 100644
--- a/src/overlay104/ov104_02239130.c
+++ b/src/overlay104/ov104_02239130.c
@@ -63,9 +63,9 @@ BOOL ov104_02239130(UnkStruct_ov104_0222E930 *param0)
         break;
     case (30 + 16):
         *v7 = sub_0204AA04(v2);
-        v0 = SaveData_TVBroadcast(v8->unk_08);
+        v0 = SaveData_TVBroadcast(v8->saveData);
         sub_0206D0C8(v0, *v7);
-        GameRecords_AddToRecordValue(SaveData_GetGameRecordsPtr(v8->unk_08), RECORD_UNK_068, *v7);
+        GameRecords_AddToRecordValue(SaveData_GetGameRecordsPtr(v8->saveData), RECORD_UNK_068, *v7);
         break;
     case (30 + 25):
         *v7 = ov104_0223927C(v2, v6);
@@ -86,7 +86,7 @@ BOOL ov104_02239130(UnkStruct_ov104_0222E930 *param0)
         *v7 = (u16)sub_0204A9F8(v2);
         break;
     case (30 + 10):
-        ov104_022394A4(v2, v8->unk_08);
+        ov104_022394A4(v2, v8->saveData);
         break;
     case (30 + 11):
         *v7 = ov104_02239588(v2, v6);
@@ -95,10 +95,10 @@ BOOL ov104_02239130(UnkStruct_ov104_0222E930 *param0)
         ov104_022395A0(v2, v6);
         break;
     case (30 + 7):
-        sub_0204A660(v2, v8->unk_08);
+        sub_0204A660(v2, v8->saveData);
         break;
     case (30 + 8):
-        sub_0204A7A4(v2, v8->unk_08, v8->unk_0C);
+        sub_0204A7A4(v2, v8->saveData, v8->journalEntry);
         break;
     case (30 + 9):
         sub_0204A8C8(v2);
@@ -267,7 +267,7 @@ static BOOL ov104_0223942C(UnkStruct_ov104_0222E930 *param0)
 
     v0 = sub_0209B978(param0->unk_00->unk_00);
 
-    if (ov104_02239464(param0, v0, v1->unk_08, param0->unk_78[0], param0->unk_78[1]) == 1) {
+    if (ov104_02239464(param0, v0, v1->saveData, param0->unk_78[0], param0->unk_78[1]) == 1) {
         return 1;
     }
 
diff --git a/src/overlay104/ov104_022395F0.c b/src/overlay104/ov104_022395F0.c
index dfef9622f7..bc9fe4ad02 100644
--- a/src/overlay104/ov104_022395F0.c
+++ b/src/overlay104/ov104_022395F0.c
@@ -49,7 +49,7 @@ BOOL ov104_022395F0(UnkStruct_ov104_0222E930 *param0)
 {
     UnkStruct_0209BBA4 *v0;
     UnkStruct_ov104_02230BE4 *v1 = sub_0209B970(param0->unk_00->unk_00);
-    v0 = ov104_02239C58(v1->unk_08);
+    v0 = ov104_02239C58(v1->saveData);
 
     sub_0209B980(param0->unk_00->unk_00, v0);
     return 0;
@@ -233,16 +233,16 @@ BOOL ov104_022397B0(UnkStruct_ov104_0222E930 *param0)
         break;
 
     case 3:
-        *v9 = (u16)sub_02030698(sub_0203068C(v5->unk_08), 106, sub_0205E6A8(106));
+        *v9 = (u16)sub_02030698(sub_0203068C(v5->saveData), 106, sub_0205E6A8(106));
         break;
     case 4:
-        *v9 = sub_02030698(sub_0203068C(v5->unk_08), sub_0205E55C(3), sub_0205E6A8(sub_0205E55C(3)));
+        *v9 = sub_02030698(sub_0203068C(v5->saveData), sub_0205E55C(3), sub_0205E6A8(sub_0205E55C(3)));
         break;
     case 5:
         *v9 = v4->unk_76[v7];
         break;
     case 6:
-        sub_0204FA50(v5->unk_08, sub_0203026C(v5->unk_08), 3);
+        sub_0204FA50(v5->saveData, sub_0203026C(v5->saveData), 3);
         break;
     case 7:
         v4->unk_A0 = v7;
@@ -325,11 +325,11 @@ BOOL ov104_02239B14(UnkStruct_ov104_0222E930 *param0)
     v4 = *v3;
     ov104_02239C7C(v3);
 
-    v1 = sub_0204A124(v2->unk_08, 0, 6);
+    v1 = sub_0204A124(v2->saveData, 0, 6);
     sub_0209B980(param0->unk_00->unk_00, v1);
 
     if (v1->unk_0F == 6) {
-        ov104_0222E630(v2->unk_08);
+        ov104_0222E630(v2->saveData);
     }
 
     for (v0 = 0; v0 < v1->unk_0E; v0++) {
@@ -344,10 +344,10 @@ BOOL ov104_02239B14(UnkStruct_ov104_0222E930 *param0)
     v1->unk_10_5 = 5 + v1->unk_12;
 
     if (CommSys_CurNetId() == 0) {
-        sub_0204A4C8(v1, v2->unk_08);
+        sub_0204A4C8(v1, v2->saveData);
     }
 
-    HealAllPokemonInParty(Party_GetFromSavedata(v2->unk_08));
+    HealAllPokemonInParty(Party_GetFromSavedata(v2->saveData));
     sub_0209BA80(v1);
 
     v1->unk_8D4 = 0;
diff --git a/src/overlay104/ov104_0223A0C4.c b/src/overlay104/ov104_0223A0C4.c
index fcabdbb342..4fd08e997c 100644
--- a/src/overlay104/ov104_0223A0C4.c
+++ b/src/overlay104/ov104_0223A0C4.c
@@ -905,15 +905,15 @@ FieldBattleDTO *ov104_0223A580(UnkStruct_0204AFC4 *param0, UnkStruct_ov104_02230
     u8 v1;
     u32 v2;
     FieldBattleDTO *v3;
-    SaveData *v4;
+    SaveData *saveData;
     Party *v5;
     Pokemon *v6;
 
     v3 = FieldBattleDTO_New(param0->unk_04, ov104_0223A700(param0->unk_0F));
-    v4 = param1->unk_08;
-    v5 = Party_GetFromSavedata(v4);
+    saveData = param1->saveData;
+    v5 = Party_GetFromSavedata(saveData);
 
-    FieldBattleDTO_InitFromGameState(v3, NULL, param1->unk_08, param1->unk_1C, param1->unk_0C, param1->unk_10, param1->unk_20);
+    FieldBattleDTO_InitFromGameState(v3, NULL, param1->saveData, param1->unk_1C, param1->journalEntry, param1->bagCursor, param1->unk_20);
 
     v3->background = 18;
     v3->terrain = TERRAIN_BATTLE_TOWER;
diff --git a/src/overlay104/ov104_0223A7F4.c b/src/overlay104/ov104_0223A7F4.c
index 61681a056e..2a76991573 100644
--- a/src/overlay104/ov104_0223A7F4.c
+++ b/src/overlay104/ov104_0223A7F4.c
@@ -356,7 +356,7 @@ FieldBattleDTO *ov104_0223ABA0(UnkStruct_ov104_0223ADA0 *param0, UnkStruct_ov104
     HealAllPokemonInParty(param0->unk_4D8);
 
     v4 = FieldBattleDTO_New(11, ov104_0223AD74(param0->unk_04));
-    FieldBattleDTO_InitFromGameState(v4, NULL, param1->unk_08, param1->unk_1C, param1->unk_0C, param1->unk_10, param1->unk_20);
+    FieldBattleDTO_InitFromGameState(v4, NULL, param1->saveData, param1->unk_1C, param1->journalEntry, param1->bagCursor, param1->unk_20);
 
     v4->background = 19;
     v4->terrain = TERRAIN_BATTLE_FACTORY;
diff --git a/src/overlay104/ov104_0223AF58.c b/src/overlay104/ov104_0223AF58.c
index bbe4d0891f..577dcaffaa 100644
--- a/src/overlay104/ov104_0223AF58.c
+++ b/src/overlay104/ov104_0223AF58.c
@@ -1588,7 +1588,7 @@ FieldBattleDTO *ov104_0223B250(UnkStruct_ov104_0223B5C0 *param0, UnkStruct_ov104
     HealAllPokemonInParty(v13);
 
     v8 = FieldBattleDTO_New(11, ov104_0223B4D4(param0->unk_04));
-    FieldBattleDTO_InitFromGameState(v8, NULL, param1->unk_08, param1->unk_1C, param1->unk_0C, param1->unk_10, param1->unk_20);
+    FieldBattleDTO_InitFromGameState(v8, NULL, param1->saveData, param1->unk_1C, param1->journalEntry, param1->bagCursor, param1->unk_20);
 
     v8->background = 22;
     v8->terrain = TERRAIN_BATTLE_HALL;
diff --git a/src/overlay104/ov104_0223B6F4.c b/src/overlay104/ov104_0223B6F4.c
index d3eeb11749..5954980fce 100644
--- a/src/overlay104/ov104_0223B6F4.c
+++ b/src/overlay104/ov104_0223B6F4.c
@@ -172,7 +172,7 @@ FieldBattleDTO *ov104_0223B810(UnkStruct_ov104_0223BA10 *param0, UnkStruct_ov104
 
     HealAllPokemonInParty(param0->unk_2C);
     v5 = FieldBattleDTO_New(11, ov104_0223B9E4(param0->unk_10));
-    FieldBattleDTO_InitFromGameState(v5, NULL, param1->unk_08, param1->unk_1C, param1->unk_0C, param1->unk_10, param1->unk_20);
+    FieldBattleDTO_InitFromGameState(v5, NULL, param1->saveData, param1->unk_1C, param1->journalEntry, param1->bagCursor, param1->unk_20);
 
     v5->background = 21;
     v5->terrain = TERRAIN_BATTLE_CASTLE;
diff --git a/src/overlay104/ov104_0223BCBC.c b/src/overlay104/ov104_0223BCBC.c
index 1304f0197a..0ddbd63cb9 100644
--- a/src/overlay104/ov104_0223BCBC.c
+++ b/src/overlay104/ov104_0223BCBC.c
@@ -177,7 +177,7 @@ FieldBattleDTO *ov104_0223BDD8(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104
     v3 = ov104_0223BDA4(param0->unk_10, 0);
     v5 = FieldBattleDTO_New(11, ov104_0223BFD0(param0->unk_10));
 
-    FieldBattleDTO_InitFromGameState(v5, NULL, param1->unk_08, param1->unk_1C, param1->unk_0C, param1->unk_10, param1->unk_20);
+    FieldBattleDTO_InitFromGameState(v5, NULL, param1->saveData, param1->unk_1C, param1->journalEntry, param1->bagCursor, param1->unk_20);
 
     v5->background = 20;
     v5->terrain = TERRAIN_BATTLE_ARCADE;
diff --git a/src/overlay104/ov104_0223C2D4.c b/src/overlay104/ov104_0223C2D4.c
index 4d17ee588e..ca05e9b292 100644
--- a/src/overlay104/ov104_0223C2D4.c
+++ b/src/overlay104/ov104_0223C2D4.c
@@ -119,7 +119,7 @@ UnkStruct_ov104_0223C4CC *ov104_0223C2D4(UnkStruct_0209B75C *param0)
     UnkStruct_ov104_0223C4CC *v0;
     int v1, v2;
     UnkStruct_ov104_02230BE4 *v3 = sub_0209B970(param0);
-    const TrainerInfo *v4 = SaveData_GetTrainerInfo(v3->unk_08);
+    const TrainerInfo *v4 = SaveData_GetTrainerInfo(v3->saveData);
     v2 = v3->unk_24;
 
     SetVBlankCallback(NULL, NULL);
@@ -613,7 +613,7 @@ static void ov104_0223CB80(UnkStruct_ov104_0223C4CC *param0)
 
         v0 = sub_0209B970(param0->unk_08);
 
-        LoadMessageBoxGraphics(param0->unk_00, 1, (1024 - (18 + 12)), 11, Options_Frame(v0->unk_04), HEAP_ID_94);
+        LoadMessageBoxGraphics(param0->unk_00, 1, (1024 - (18 + 12)), 11, Options_Frame(v0->options), HEAP_ID_94);
         PaletteData_LoadBufferFromHardware(param0->unk_04, 0, 11 * 16, 0x20);
     }
 
diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c
index 83b76d3d13..15dda0b5da 100644
--- a/src/overlay109/ov109_021D0D80.c
+++ b/src/overlay109/ov109_021D0D80.c
@@ -1275,7 +1275,6 @@ static int ov109_021D1918(UnkStruct_ov109_021D0F70 *param0)
 
     {
         u32 v0;
-        BOOL v1;
 
         v0 = Unk_ov109_021D5BE4[param0->unk_2C.unk_04][0];
         v0 += LCRNG_Next() % (Unk_ov109_021D5BE4[param0->unk_2C.unk_04][1] - v0 + 1);
@@ -1288,10 +1287,10 @@ static int ov109_021D1918(UnkStruct_ov109_021D0F70 *param0)
 
         ov109_021D2714(param0, 3, v0);
 
-        v1 = Bag_TryAddItem(SaveData_GetBag(param0->unk_CC->unk_14.unk_08), v0, 1, HEAP_ID_95);
+        BOOL removedItem = Bag_TryAddItem(SaveData_GetBag(param0->unk_CC->unk_14.unk_08), v0, 1, HEAP_ID_95);
         sub_02006150(1158);
 
-        if (v1 == 1) {
+        if (removedItem == TRUE) {
             param0->unk_00 = 40;
         } else {
             param0->unk_00 = 41;
diff --git a/src/poffin.c b/src/poffin.c
index 225157f043..5f4a7091b0 100644
--- a/src/poffin.c
+++ b/src/poffin.c
@@ -223,7 +223,7 @@ u8 Poffin_CalcLevel(Poffin *poffin)
 
 PoffinCase *Poffin_GetSavedataBlock(SaveData *savedata)
 {
-    return SaveData_SaveTable(savedata, 16);
+    return SaveData_SaveTable(savedata, SAVE_TABLE_ENTRY_POFFINS);
 }
 
 int Poffin_SaveSize(void)
diff --git a/src/pokeradar.c b/src/pokeradar.c
index 5444f8e493..ae1622d1cc 100644
--- a/src/pokeradar.c
+++ b/src/pokeradar.c
@@ -500,7 +500,7 @@ void RadarChargeStep(FieldSystem *fieldSystem)
 {
     u8 *v0;
 
-    if (Bag_CanRemoveItem(SaveData_GetBag(fieldSystem->saveData), 431, 1, 4) == 1) {
+    if (Bag_CanRemoveItem(SaveData_GetBag(fieldSystem->saveData), ITEM_POKE_RADAR, 1, HEAP_ID_FIELD) == TRUE) {
         v0 = SpecialEncounter_GetRadarCharge(SaveData_GetSpecialEncounters(fieldSystem->saveData));
         if ((*v0) < RADAR_BATTERY_STEPS) {
             (*v0)++;
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 35874b87c3..404a70737a 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -7670,12 +7670,12 @@ static BOOL ScrCmd_2C4(ScriptContext *ctx)
         v2->unk_00 = NULL;
     }
 
-    v2->unk_04 = SaveData_Options(ctx->fieldSystem->saveData);
+    v2->options = SaveData_Options(ctx->fieldSystem->saveData);
     v2->unk_24 = v1;
-    v2->unk_08 = ctx->fieldSystem->saveData;
+    v2->saveData = ctx->fieldSystem->saveData;
     v2->unk_1C = ctx->fieldSystem->location->mapId;
-    v2->unk_0C = ctx->fieldSystem->journalEntry;
-    v2->unk_10 = ctx->fieldSystem->unk_98;
+    v2->journalEntry = ctx->fieldSystem->journalEntry;
+    v2->bagCursor = ctx->fieldSystem->bagCursor;
     v2->unk_20 = ctx->fieldSystem->battleSubscreenCursorOn;
 
     FieldTask_RunApplication(ctx->task, &Unk_020F8BE0, v2);
diff --git a/src/start_menu.c b/src/start_menu.c
index 5f1b3d664f..7b33c7d83d 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -1120,19 +1120,15 @@ BOOL sub_0203B7C0(FieldTask *taskMan)
         sub_0203B674(menu, sub_0203C558);
     } break;
     case 3: {
-        Bag *v11;
-        void *v12;
-        u32 *v13;
-
-        v13 = (u32 *)Heap_AllocFromHeap(HEAP_ID_FIELDMAP, 4);
+        u32 *v13 = (u32 *)Heap_AllocFromHeap(HEAP_ID_FIELDMAP, 4);
         *v13 = partyMan->selectedMonSlot;
         menu->unk_260 = (void *)v13;
 
-        v11 = SaveData_GetBag(fieldSystem->saveData);
-        v12 = SaveData_GetTrainerInfo(fieldSystem->saveData);
-        menu->unk_25C = sub_0207D824(v11, Unk_020EA020, HEAP_ID_FIELDMAP);
+        Bag *bag = SaveData_GetBag(fieldSystem->saveData);
+        TrainerInfo *v12 = SaveData_GetTrainerInfo(fieldSystem->saveData);
+        menu->unk_25C = sub_0207D824(bag, Unk_020EA020, HEAP_ID_FIELDMAP);
 
-        sub_0207CB2C(menu->unk_25C, fieldSystem->saveData, 1, fieldSystem->unk_98);
+        sub_0207CB2C(menu->unk_25C, fieldSystem->saveData, 1, fieldSystem->bagCursor);
 
         sub_0203D1E4(fieldSystem, menu->unk_25C);
         sub_0203B674(menu, sub_0203BC5C);
@@ -1631,32 +1627,29 @@ static BOOL sub_0203C1C8(FieldTask *taskMan)
     return 0;
 }
 
-static void sub_0203C2D8(FieldTask *taskMan, u16 param1)
+static void sub_0203C2D8(FieldTask *taskMan, u16 item)
 {
-    FieldSystem *fieldSystem;
-    StartMenu *menu;
-    Bag *v2;
-    u8 v3;
+    u8 i;
     u8 v4, v5, v6;
 
-    fieldSystem = FieldTask_GetFieldSystem(taskMan);
-    menu = FieldTask_GetEnv(taskMan);
+    FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan);
+    StartMenu *menu = FieldTask_GetEnv(taskMan);
 
     menu->unk_25C = sub_020972FC(HEAP_ID_FIELDMAP);
-    v2 = SaveData_GetBag(fieldSystem->saveData);
-    sub_02097320(menu->unk_25C, param1, 1);
+    Bag *bag = SaveData_GetBag(fieldSystem->saveData);
+    sub_02097320(menu->unk_25C, item, 1);
     v6 = 0;
 
-    for (v3 = 0; v3 < 64; v3++) {
-        param1 = Item_ForBerryNumber(v3);
+    for (i = 0; i < NUM_BERRIES; i++) {
+        item = Item_ForBerryNumber(i);
 
-        if (Bag_CanRemoveItem(v2, param1, 1, 11) == 1) {
-            sub_02097320(menu->unk_25C, param1, 0);
+        if (Bag_CanRemoveItem(bag, item, 1, HEAP_ID_FIELDMAP) == TRUE) {
+            sub_02097320(menu->unk_25C, item, 0);
             v6++;
         }
     }
 
-    BagCursor_GetFieldPocketPosition(fieldSystem->unk_98, 4, &v5, &v4);
+    BagCursor_GetFieldPocketPosition(fieldSystem->bagCursor, 4, &v5, &v4);
     sub_0209733C(menu->unk_25C, v4, v5, v6 + 3);
 
     sub_0203D2E4(fieldSystem, menu->unk_25C);
@@ -1673,7 +1666,7 @@ static BOOL sub_0203C390(FieldTask *taskMan)
     menu = FieldTask_GetEnv(taskMan);
 
     sub_02097390(menu->unk_25C, &v2, &v3);
-    BagCursor_SetFieldPocketPosition(fieldSystem->unk_98, 4, v3, v2);
+    BagCursor_SetFieldPocketPosition(fieldSystem->bagCursor, 4, v3, v2);
     Heap_FreeToHeapExplicit(HEAP_ID_FIELDMAP, menu->unk_25C);
 
     menu->unk_25C = sub_0203D20C(fieldSystem, &menu->unk_230);
diff --git a/src/unk_0202ACE0.c b/src/unk_0202ACE0.c
index a9192c3fef..1418ca18fc 100644
--- a/src/unk_0202ACE0.c
+++ b/src/unk_0202ACE0.c
@@ -374,8 +374,8 @@ void sub_0202B270(UnkStruct_0202B370 *param0, int param1, int param2)
     param0->unk_1C0[param1].unk_2E = 2;
 }
 
-UnkStruct_0202B370 *sub_0202B370(SaveData *param0)
+UnkStruct_0202B370 *sub_0202B370(SaveData *saveData)
 {
-    UnkStruct_0202B370 *v0 = SaveData_SaveTable(param0, 29);
+    UnkStruct_0202B370 *v0 = SaveData_SaveTable(saveData, 29);
     return v0;
 }
diff --git a/src/unk_0202F1D4.c b/src/unk_0202F1D4.c
index d80e64b43d..8157ed88f9 100644
--- a/src/unk_0202F1D4.c
+++ b/src/unk_0202F1D4.c
@@ -54,14 +54,14 @@ void BattleRecording_Init(BattleRecording *param0)
     param0->unk_00 = 0xffffffff;
 }
 
-void sub_0202F1F8(SaveData *param0, int param1, int *param2)
+void sub_0202F1F8(SaveData *saveData, int heapID, int *param2)
 {
     if (Unk_021C07A4 != NULL) {
         Heap_FreeToHeap(Unk_021C07A4);
         Unk_021C07A4 = NULL;
     }
 
-    Unk_021C07A4 = SaveData_BattleRecording(param0, param1, param2, 0);
+    Unk_021C07A4 = SaveData_BattleRecording(saveData, heapID, param2, 0);
     BattleRecording_Init(Unk_021C07A4);
 }
 
diff --git a/src/unk_02030CE8.c b/src/unk_02030CE8.c
index b7bcdfe964..925c76375d 100644
--- a/src/unk_02030CE8.c
+++ b/src/unk_02030CE8.c
@@ -37,9 +37,9 @@ void sub_02030D10(SaveData *param0)
     Email_Init(SaveData_SaveTable(param0, 35));
 }
 
-BOOL sub_02030D20(SaveData *param0)
+BOOL sub_02030D20(SaveData *saveData)
 {
-    UnkStruct_02030CEC *v0 = SaveData_SaveTable(param0, 35);
+    UnkStruct_02030CEC *v0 = SaveData_SaveTable(saveData, 35);
 
     if (v0->unk_00[0] == '\0') {
         return 0;
diff --git a/src/unk_02038FFC.c b/src/unk_02038FFC.c
index 8bc64d7985..edb1051131 100644
--- a/src/unk_02038FFC.c
+++ b/src/unk_02038FFC.c
@@ -50,9 +50,9 @@ int sub_02039058(UnkStruct_0202B370 *param0)
     return DWC_GetGsProfileId(v0, &v1);
 }
 
-BOOL sub_02039074(SaveData *param0)
+BOOL sub_02039074(SaveData *saveData)
 {
-    UnkStruct_0202B370 *v0 = sub_0202B370(param0);
+    UnkStruct_0202B370 *v0 = sub_0202B370(saveData);
     DWCUserData *v1 = sub_0202AD28(v0);
 
     if (DWC_CheckHasProfile(v1)
diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c
index 5a1aeab420..7ca909801c 100644
--- a/src/unk_0203D1B8.c
+++ b/src/unk_0203D1B8.c
@@ -292,7 +292,7 @@ void *sub_0203D20C(FieldSystem *fieldSystem, UnkStruct_020684D0 *param1)
     v0 = SaveData_GetBag(fieldSystem->saveData);
     v1 = sub_0207D824(v0, Unk_020EA164, HEAP_ID_FIELDMAP);
 
-    sub_0207CB2C(v1, fieldSystem->saveData, 0, fieldSystem->unk_98);
+    sub_0207CB2C(v1, fieldSystem->saveData, 0, fieldSystem->bagCursor);
     sub_0207CB78(v1, fieldSystem->mapLoadType);
 
     if (PlayerAvatar_GetPlayerState(fieldSystem->playerAvatar) == 0x1) {
@@ -326,7 +326,7 @@ void *sub_0203D264(FieldSystem *fieldSystem, int param1)
 
     v0 = sub_0207D824(v4, v1, HEAP_ID_FIELD_TASK);
 
-    sub_0207CB2C(v0, fieldSystem->saveData, 3, fieldSystem->unk_98);
+    sub_0207CB2C(v0, fieldSystem->saveData, 3, fieldSystem->bagCursor);
     sub_0203D1E4(fieldSystem, v0);
 
     return v0;
diff --git a/src/unk_0206CCB0.c b/src/unk_0206CCB0.c
index 48caae7ce6..5d46f08227 100644
--- a/src/unk_0206CCB0.c
+++ b/src/unk_0206CCB0.c
@@ -1217,7 +1217,7 @@ static int sub_0206DAFC(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr
 
 static BOOL sub_0206DB08(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1)
 {
-    return Bag_CanRemoveItem(SaveData_GetBag(fieldSystem->saveData), 428, 1, HEAP_ID_FIELD_TASK);
+    return Bag_CanRemoveItem(SaveData_GetBag(fieldSystem->saveData), ITEM_EXPLORER_KIT, 1, HEAP_ID_FIELD_TASK);
 }
 
 void sub_0206DB20(FieldSystem *fieldSystem)
@@ -1539,7 +1539,7 @@ static int sub_0206DF88(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr
 
 static BOOL sub_0206DFC8(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1)
 {
-    return Bag_CanRemoveItem(SaveData_GetBag(fieldSystem->saveData), 428, 1, HEAP_ID_FIELD_TASK);
+    return Bag_CanRemoveItem(SaveData_GetBag(fieldSystem->saveData), ITEM_EXPLORER_KIT, 1, HEAP_ID_FIELD_TASK);
 }
 
 void sub_0206DFE0(SaveData *param0)
diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c
index 632c660e8a..20130a860b 100644
--- a/src/unk_0207AE68.c
+++ b/src/unk_0207AE68.c
@@ -106,7 +106,7 @@ UnkStruct_0207AE68 *sub_0207AE68(Party *param0, Pokemon *param1, int param2, Opt
     v0->unk_60 = Pokemon_GetValue(param1, MON_DATA_SPECIES, NULL);
     v0->unk_86 = Pokemon_GetValue(param1, MON_DATA_FORM, NULL);
     v0->unk_62 = param2;
-    v0->unk_5C = heapID;
+    v0->heapID = heapID;
     v0->unk_80 = NARC_ctor(NARC_INDEX_POKETOOL__POKE_EDIT__PL_POKE_DATA, heapID);
 
     PokeSprite_LoadCryDelay(v0->unk_80, &(v0->unk_84), v0->unk_60, 1);
@@ -310,7 +310,7 @@ static void sub_0207B180(UnkStruct_0207AE68 *param0)
             {
                 UnkStruct_0207C894 v1;
 
-                v1.heapID = param0->unk_5C;
+                v1.heapID = param0->heapID;
                 v1.unk_04 = 0;
                 param0->unk_30 = sub_0207C894(&v1);
 
@@ -318,7 +318,7 @@ static void sub_0207B180(UnkStruct_0207AE68 *param0)
                 PokemonSprite_StartFade(param0->unk_1C[0], 0, 16, 4, 0x7fff);
                 PokemonSprite_StartFade(param0->unk_1C[1], 0, 16, 4, 0x7fff);
 
-                GF_ASSERT(Heap_FndGetTotalFreeSizeForExpHeap(param0->unk_5C) > 0x8000);
+                GF_ASSERT(Heap_FndGetTotalFreeSizeForExpHeap(param0->heapID) > 0x8000);
                 Sound_PlayEffect(SEQ_SE_DP_W025);
             }
             param0->unk_66 = 40;
@@ -475,11 +475,11 @@ static void sub_0207B180(UnkStruct_0207AE68 *param0)
         }
         break;
     case 20:
-        param0->unk_40 = Menu_MakeYesNoChoice(param0->unk_00, &Unk_020F0A30, 1, 8, param0->unk_5C);
+        param0->unk_40 = Menu_MakeYesNoChoice(param0->unk_00, &Unk_020F0A30, 1, 8, param0->heapID);
         param0->unk_64++;
         break;
     case 21:
-        switch (Menu_ProcessInputAndHandleExit(param0->unk_40, param0->unk_5C)) {
+        switch (Menu_ProcessInputAndHandleExit(param0->unk_40, param0->heapID)) {
         case 0:
             param0->unk_64 = 22;
             PaletteData_StartFade(param0->unk_14, (0x1 | 0x2 | 0x4 | 0x8), 0xffff, 1, 0, 16, 0x0);
@@ -545,11 +545,11 @@ static void sub_0207B180(UnkStruct_0207AE68 *param0)
         param0->unk_64++;
         break;
     case 34:
-        param0->unk_40 = Menu_MakeYesNoChoice(param0->unk_00, &Unk_020F0A30, 1, 8, param0->unk_5C);
+        param0->unk_40 = Menu_MakeYesNoChoice(param0->unk_00, &Unk_020F0A30, 1, 8, param0->heapID);
         param0->unk_64++;
         break;
     case 35:
-        switch (Menu_ProcessInputAndHandleExit(param0->unk_40, param0->unk_5C)) {
+        switch (Menu_ProcessInputAndHandleExit(param0->unk_40, param0->heapID)) {
         case 0:
             StringTemplate_SetNickname(param0->unk_0C, 0, Pokemon_GetBoxPokemon(param0->unk_28));
             StringTemplate_SetMoveName(param0->unk_0C, 1, param0->unk_6C);
@@ -687,14 +687,14 @@ static void sub_0207C028(UnkStruct_0207AE68 *param0)
     switch (param0->unk_78) {
     case 13:
     case 14:
-        if (Bag_GetItemQuantity(param0->unk_4C, ITEM_POKE_BALL, param0->unk_5C) && (Party_GetCurrentCount(param0->unk_24) < 6)) {
+        if (Bag_GetItemQuantity(param0->unk_4C, ITEM_POKE_BALL, param0->heapID) && (Party_GetCurrentCount(param0->unk_24) < 6)) {
             {
                 Pokemon *v1;
                 int v2;
                 Mail *v3;
                 UnkStruct_0202CA28 v4;
 
-                v1 = Pokemon_New(param0->unk_5C);
+                v1 = Pokemon_New(param0->heapID);
                 Pokemon_Copy(param0->unk_28, v1);
 
                 v2 = SPECIES_SHEDINJA;
@@ -723,7 +723,7 @@ static void sub_0207C028(UnkStruct_0207AE68 *param0)
                 Pokemon_SetValue(v1, MON_DATA_HAS_NICKNAME, &v2);
                 Pokemon_SetValue(v1, MON_DATA_STATUS_CONDITION, &v2);
 
-                v3 = sub_0202818C(param0->unk_5C);
+                v3 = sub_0202818C(param0->heapID);
                 Pokemon_SetValue(v1, MON_DATA_MAIL, v3);
                 Heap_FreeToHeap(v3);
                 Pokemon_SetValue(v1, MON_DATA_MAIL_ID, &v2);
@@ -743,7 +743,7 @@ static void sub_0207C028(UnkStruct_0207AE68 *param0)
                 GameRecords_IncrementTrainerScore(param0->records, TRAINER_SCORE_EVENT_CAUGHT_SPECIES);
                 Poketch_PokemonHistoryEnqueue(param0->poketch, Pokemon_GetBoxPokemon(v1));
                 Heap_FreeToHeap(v1);
-                Bag_TryRemoveItem(param0->unk_4C, ITEM_POKE_BALL, 1, param0->unk_5C);
+                Bag_TryRemoveItem(param0->unk_4C, ITEM_POKE_BALL, 1, param0->heapID);
             }
         }
         break;
@@ -886,14 +886,14 @@ static void sub_0207C1CC(UnkStruct_0207AE68 *param0, BgConfig *param1)
 
         v4 = Options_Frame(param0->unk_2C);
 
-        ReplaceTransparentTiles(param1, 1, 1, 10, v4, param0->unk_5C);
-        Graphics_LoadTilesToBgLayer(v5, v6, param1, v9, 0, 0, 1, param0->unk_5C);
-        Graphics_LoadTilemapToBgLayer(v5, v7, param1, v9, 0, 0, 1, param0->unk_5C);
-        PaletteData_LoadBufferFromFileStart(param0->unk_14, v5, v8, param0->unk_5C, 0, 0x20 * 2, 0);
-        PaletteData_LoadBufferFromFileStart(param0->unk_14, 38, GetMessageBoxPaletteNARCMember(v4), param0->unk_5C, 0, 0x20, 10 * 0x10);
-        PaletteData_LoadBufferFromFileStart(param0->unk_14, 14, 7, param0->unk_5C, 0, 0x20, 0xb * 0x10);
-        LoadStandardWindowTiles(param0->unk_00, 2, 1, 0, param0->unk_5C);
-        PaletteData_LoadBufferFromFileStart(param0->unk_14, 38, GetStandardWindowPaletteNARCMember(), param0->unk_5C, 0, 0x20, 8 * 0x10);
+        ReplaceTransparentTiles(param1, 1, 1, 10, v4, param0->heapID);
+        Graphics_LoadTilesToBgLayer(v5, v6, param1, v9, 0, 0, 1, param0->heapID);
+        Graphics_LoadTilemapToBgLayer(v5, v7, param1, v9, 0, 0, 1, param0->heapID);
+        PaletteData_LoadBufferFromFileStart(param0->unk_14, v5, v8, param0->heapID, 0, 0x20 * 2, 0);
+        PaletteData_LoadBufferFromFileStart(param0->unk_14, 38, GetMessageBoxPaletteNARCMember(v4), param0->heapID, 0, 0x20, 10 * 0x10);
+        PaletteData_LoadBufferFromFileStart(param0->unk_14, 14, 7, param0->heapID, 0, 0x20, 0xb * 0x10);
+        LoadStandardWindowTiles(param0->unk_00, 2, 1, 0, param0->heapID);
+        PaletteData_LoadBufferFromFileStart(param0->unk_14, 38, GetStandardWindowPaletteNARCMember(), param0->heapID, 0, 0x20, 8 * 0x10);
     }
 
     {
@@ -903,9 +903,9 @@ static void sub_0207C1CC(UnkStruct_0207AE68 *param0, BgConfig *param1)
         int v13 = 12;
         int v14 = 4;
 
-        Graphics_LoadTilesToBgLayer(v10, v11, param1, v14, 0, 0, 1, param0->unk_5C);
-        Graphics_LoadTilemapToBgLayer(v10, v12, param1, v14, 0, 0, 1, param0->unk_5C);
-        PaletteData_LoadBufferFromFileStart(param0->unk_14, v10, v13, param0->unk_5C, 1, 0x20 * 1, 0);
+        Graphics_LoadTilesToBgLayer(v10, v11, param1, v14, 0, 0, 1, param0->heapID);
+        Graphics_LoadTilemapToBgLayer(v10, v12, param1, v14, 0, 0, 1, param0->heapID);
+        PaletteData_LoadBufferFromFileStart(param0->unk_14, v10, v13, param0->heapID, 1, 0x20 * 1, 0);
     }
 
     GX_SetVisibleWnd(GX_WNDMASK_W0);
@@ -941,7 +941,7 @@ static void sub_0207C498(UnkStruct_0207AE68 *param0)
     Pokemon_BuildSpriteTemplate(&v0, param0->unk_28, 2);
 
     param0->unk_1C[0] = PokemonSpriteManager_CreateSprite(param0->unk_18, &v0, 128, 80, 0, 0, NULL, NULL);
-    v1 = Pokemon_New(param0->unk_5C);
+    v1 = Pokemon_New(param0->heapID);
 
     Pokemon_Copy(param0->unk_28, v1);
     Pokemon_SetValue(v1, MON_DATA_SPECIES, (u8 *)&param0->unk_62);
@@ -1009,5 +1009,5 @@ static BOOL sub_0207C5CC(TextPrinterTemplate *param0, u16 param1)
 
 static void sub_0207C624(UnkStruct_0207AE68 *param0)
 {
-    param0->unk_38 = OverlayManager_New(&gPokemonSummaryScreenApp, param0->unk_3C, param0->unk_5C);
+    param0->unk_38 = OverlayManager_New(&gPokemonSummaryScreenApp, param0->unk_3C, param0->heapID);
 }
diff --git a/src/unk_0207DA28.c b/src/unk_0207DA28.c
index ba10689f92..43d70f0921 100644
--- a/src/unk_0207DA28.c
+++ b/src/unk_0207DA28.c
@@ -84,15 +84,15 @@ static const u8 Unk_020F1B64[4] = {
     0x4
 };
 
-static BOOL sub_0207DA28(FieldTask *param0)
+static BOOL sub_0207DA28(FieldTask *task)
 {
     int v0;
-    FieldSystem *fieldSystem = FieldTask_GetFieldSystem(param0);
-    UnkStruct_0207DE40 *v2 = FieldTask_GetEnv(param0);
+    FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task);
+    UnkStruct_0207DE40 *v2 = FieldTask_GetEnv(task);
 
     switch (v2->unk_04) {
     case 0:
-        v2->unk_00->unk_00 = fieldSystem->saveData;
+        v2->unk_00->saveData = fieldSystem->saveData;
     case 1:
         v2->unk_04++;
 
@@ -104,7 +104,7 @@ static BOOL sub_0207DA28(FieldTask *param0)
         }
         break;
     case 2:
-        FieldTask_RunApplication(param0, &Unk_020F1B98, v2->unk_00);
+        FieldTask_RunApplication(task, &Unk_020F1B98, v2->unk_00);
         v2->unk_04++;
         break;
     case 3:
@@ -174,14 +174,14 @@ static BOOL sub_0207DA28(FieldTask *param0)
         }
         break;
     case 4:
-        Encounter_NewVsWiFi(param0, v2->unk_00->unk_08, v2->unk_0C, v2->unk_0D);
+        Encounter_NewVsWiFi(task, v2->unk_00->unk_08, v2->unk_0C, v2->unk_0D);
         v2->unk_04++;
         break;
     case 5:
         v2->unk_04 = 2;
         break;
     case 6:
-        sub_0203DDDC(param0);
+        sub_0203DDDC(task);
         v2->unk_04++;
         break;
     case 7:
diff --git a/src/unk_020972FC.c b/src/unk_020972FC.c
index 530dbdd531..ff99477587 100644
--- a/src/unk_020972FC.c
+++ b/src/unk_020972FC.c
@@ -3,6 +3,8 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/items.h"
+
 #include "struct_defs/struct_020972FC.h"
 
 #include "heap.h"
@@ -16,9 +18,9 @@ UnkStruct_020972FC *sub_020972FC(u8 heapID)
     return v0;
 }
 
-void sub_02097320(UnkStruct_020972FC *param0, u16 param1, u16 param2)
+void sub_02097320(UnkStruct_020972FC *param0, u16 item, u16 param2)
 {
-    u16 v0 = param1 - 149;
+    u16 v0 = item - FIRST_BERRY_IDX;
 
     sub_02097344(param0->unk_00, v0);
 
diff --git a/src/unk_02099604.c b/src/unk_02099604.c
index fb04bd60e8..1d6785d096 100644
--- a/src/unk_02099604.c
+++ b/src/unk_02099604.c
@@ -15,17 +15,17 @@
 
 FS_EXTERN_OVERLAY(overlay82);
 
-static UnkStruct_ov82_0223B164 *sub_02099604(int param0, SaveData *param1, int heapID, JournalEntry *param3)
+static UnkStruct_ov82_0223B164 *sub_02099604(int param0, SaveData *saveData, int heapID, JournalEntry *journalEntry)
 {
     UnkStruct_ov82_0223B164 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov82_0223B164));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov82_0223B164));
 
-    v0->unk_0C = param1;
-    v0->unk_08 = Poffin_GetSavedataBlock(param1);
-    v0->unk_10 = SaveData_GetTrainerInfo(param1);
-    v0->unk_14 = SaveData_GetBag(param1);
-    v0->unk_18 = SaveData_Options(param1);
-    v0->unk_1C = param3;
+    v0->saveData = saveData;
+    v0->poffinCase = Poffin_GetSavedataBlock(saveData);
+    v0->trainerInfo = SaveData_GetTrainerInfo(saveData);
+    v0->bag = SaveData_GetBag(saveData);
+    v0->options = SaveData_Options(saveData);
+    v0->journalEntry = journalEntry;
     v0->unk_20 = 0;
     v0->unk_04 = param0;
 
diff --git a/src/unk_0209BA18.c b/src/unk_0209BA18.c
index fc2471c966..b00b0a0a98 100644
--- a/src/unk_0209BA18.c
+++ b/src/unk_0209BA18.c
@@ -28,10 +28,10 @@ UnkStruct_ov104_02230BE4 *sub_0209BA18(FieldSystem *fieldSystem, void *param1)
     MI_CpuClear8(v0, sizeof(UnkStruct_ov104_02230BE4));
 
     v0->unk_00 = param1;
-    v0->unk_04 = SaveData_Options(fieldSystem->saveData);
-    v0->unk_08 = fieldSystem->saveData;
-    v0->unk_0C = fieldSystem->journalEntry;
-    v0->unk_10 = fieldSystem->unk_98;
+    v0->options = SaveData_Options(fieldSystem->saveData);
+    v0->saveData = fieldSystem->saveData;
+    v0->journalEntry = fieldSystem->journalEntry;
+    v0->bagCursor = fieldSystem->bagCursor;
     v0->unk_20 = fieldSystem->battleSubscreenCursorOn;
     v0->unk_14 = 0;
     v0->unk_18 = 0;