1 files changed, 24 insertions, 21 deletions

diff --git a/src/code/code_8012EC80.c b/src/code/code_8012EC80.c
index f60d98568..5dee17fb5 100644
--- a/src/code/code_8012EC80.c
+++ b/src/code/code_8012EC80.c
@@ -504,7 +504,7 @@ void Inventory_ChangeEquipment(s16 value) {
 u8 Inventory_DeleteEquipment(GlobalContext* globalCtx, s16 equipment) {
     Player* player = GET_PLAYER(globalCtx);
 
-    if (CUR_EQUIP_VALUE_VOID(EQUIP_SHIELD) != 0) {
+    if (GET_CUR_EQUIP_VALUE(EQUIP_SHIELD) != 0) {
         SET_EQUIP_VALUE(EQUIP_SHIELD, 0);
         Player_SetEquipmentData(globalCtx, player);
         return true;
@@ -514,12 +514,12 @@ u8 Inventory_DeleteEquipment(GlobalContext* globalCtx, s16 equipment) {
 }
 
 void Inventory_ChangeUpgrade(s16 upgrade, u32 value) {
-    u32 upgrades = gSaveContext.inventory.upgrades;
+    u32 upgrades = gSaveContext.save.inventory.upgrades;
 
     upgrades &= gUpgradeNegMasks[upgrade];
     upgrades |= value << gUpgradeShifts[upgrade];
 
-    gSaveContext.inventory.upgrades = upgrades;
+    gSaveContext.save.inventory.upgrades = upgrades;
 }
 
 s32 Inventory_IsMapVisible(s16 sceneNum) {
@@ -546,7 +546,7 @@ s32 Inventory_IsMapVisible(s16 sceneNum) {
         }
     }
 
-    if (gSaveContext.scenesVisible[index] & gBitFlags[sceneNum - (index << 5)]) {
+    if (gSaveContext.save.scenesVisible[index] & gBitFlags[sceneNum - (index << 5)]) {
         return true;
     }
 
@@ -659,23 +659,23 @@ void Inventory_SetMapVisibility(s16 tingleIndex) {
                 index = 6;
             }
 
-            gSaveContext.scenesVisible[index] =
-                gSaveContext.scenesVisible[index] | gBitFlags[(s16)(*tingleMapSceneIndices)[i] - (index << 5)];
+            gSaveContext.save.scenesVisible[index] =
+                gSaveContext.save.scenesVisible[index] | gBitFlags[(s16)(*tingleMapSceneIndices)[i] - (index << 5)];
             i++;
         }
 
         if ((*tingleMapSceneIndices) == sScenesPerTingleMap[0]) {
-            gSaveContext.mapsVisible |= 3;
+            gSaveContext.save.mapsVisible |= 3;
         } else if ((*tingleMapSceneIndices) == sScenesPerTingleMap[1]) {
-            gSaveContext.mapsVisible |= 0x1C;
+            gSaveContext.save.mapsVisible |= 0x1C;
         } else if ((*tingleMapSceneIndices) == sScenesPerTingleMap[2]) {
-            gSaveContext.mapsVisible |= 0xE0;
+            gSaveContext.save.mapsVisible |= 0xE0;
         } else if ((*tingleMapSceneIndices) == sScenesPerTingleMap[3]) {
-            gSaveContext.mapsVisible |= 0x100;
+            gSaveContext.save.mapsVisible |= 0x100;
         } else if ((*tingleMapSceneIndices) == sScenesPerTingleMap[4]) {
-            gSaveContext.mapsVisible |= 0x1E00;
+            gSaveContext.save.mapsVisible |= 0x1E00;
         } else if ((*tingleMapSceneIndices) == sScenesPerTingleMap[5]) {
-            gSaveContext.mapsVisible |= 0x6000;
+            gSaveContext.save.mapsVisible |= 0x6000;
         }
     }
 
@@ -688,32 +688,34 @@ void Inventory_SetMapVisibility(s16 tingleIndex) {
 void Inventory_SaveDekuPlaygroundHighScore(s16 timerId) {
     s16 i;
 
-    gSaveContext.dekuPlaygroundHighScores[CURRENT_DAY - 1] = gSaveContext.unk_3DE0[timerId];
+    gSaveContext.save.dekuPlaygroundHighScores[CURRENT_DAY - 1] = gSaveContext.unk_3DE0[timerId];
 
     for (i = 0; i < 8; i++) {
-        gSaveContext.inventory.dekuPlaygroundPlayerName[CURRENT_DAY - 1][i] = gSaveContext.playerName[i];
+        gSaveContext.save.inventory.dekuPlaygroundPlayerName[CURRENT_DAY - 1][i] =
+            gSaveContext.save.playerData.playerName[i];
     }
 }
 
 void Inventory_IncrementSkullTokenCount(s16 sceneIndex) {
     if (sceneIndex == SCENE_KINSTA1) {
         // Swamp Spider House (increment high bits of skullTokenCount)
-        gSaveContext.skullTokenCount = ((u16)(((gSaveContext.skullTokenCount & 0xFFFF0000) >> 0x10) + 1) << 0x10) |
-                                       (gSaveContext.skullTokenCount & 0xFFFF);
+        gSaveContext.save.skullTokenCount =
+            ((u16)(((gSaveContext.save.skullTokenCount & 0xFFFF0000) >> 0x10) + 1) << 0x10) |
+            (gSaveContext.save.skullTokenCount & 0xFFFF);
     } else {
         // Ocean Spider House (increment low bits of skullTokenCount)
-        gSaveContext.skullTokenCount =
-            (((u16)gSaveContext.skullTokenCount + 1) & 0xFFFF) | (gSaveContext.skullTokenCount & 0xFFFF0000);
+        gSaveContext.save.skullTokenCount =
+            (((u16)gSaveContext.save.skullTokenCount + 1) & 0xFFFF) | (gSaveContext.save.skullTokenCount & 0xFFFF0000);
     }
 }
 
 s16 Inventory_GetSkullTokenCount(s16 sceneIndex) {
     if (sceneIndex == SCENE_KINSTA1) {
         // Swamp Spider House
-        return (gSaveContext.skullTokenCount & 0xFFFF0000) >> 0x10;
+        return (gSaveContext.save.skullTokenCount & 0xFFFF0000) >> 0x10;
     } else {
         // Ocean Spider House
-        return gSaveContext.skullTokenCount & 0xFFFF;
+        return gSaveContext.save.skullTokenCount & 0xFFFF;
     }
 }
 
@@ -723,5 +725,6 @@ void Inventory_SaveLotteryCodeGuess(GlobalContext* globalCtx) {
     lotteryCodeGuess = ((globalCtx->msgCtx.unk12054[0] & 0xF) << 8);  // First Digit
     lotteryCodeGuess |= ((globalCtx->msgCtx.unk12054[1] & 0xF) << 4); // Second Digit
     lotteryCodeGuess |= (globalCtx->msgCtx.unk12054[2] & 0xF);        // Third Digit
-    gSaveContext.lotteryCodeGuess = (gSaveContext.lotteryCodeGuess & 0xFFFF0000) | (lotteryCodeGuess & 0xFFFF);
+    gSaveContext.save.lotteryCodeGuess =
+        (gSaveContext.save.lotteryCodeGuess & 0xFFFF0000) | (lotteryCodeGuess & 0xFFFF);
 }