Misc Cleanup 6 (#1307)

* more cleanup

* 3 more brackets

* PR Suggestions

5 files changed, 216 insertions, 101 deletions

diff --git a/src/code/code_8012EC80.c b/src/code/code_8012EC80.c
index dc334c93e..9a2100d01 100644
--- a/src/code/code_8012EC80.c
+++ b/src/code/code_8012EC80.c
@@ -43,14 +43,14 @@ u32 gUpgradeMasks[] = {
 // 3 = two-bit masks
 // 7 = three-bit masks
 u32 gUpgradeNegMasks[] = {
-    ~(7 << 0),  // Quivers
-    ~(7 << 3),  // Bomb Bags
-    ~(7 << 6),  // Unused (Strength)
-    ~(7 << 9),  // Unused (Scale)
-    ~(3 << 12), // Wallets
-    ~(7 << 14), // Unused (Deku Seed Bullet Bags)
-    ~(7 << 17), // Unused (Deku Stick)
-    ~(7 << 20), // Unused (Deku Nut)
+    ~(7 << 0),  // UPG_QUIVER
+    ~(7 << 3),  // UPG_BOMB_BAG
+    ~(7 << 6),  // UPG_STRENGTH
+    ~(7 << 9),  // UPG_SCALE
+    ~(3 << 12), // UPG_WALLET
+    ~(7 << 14), // UPG_BULLET_BAG
+    ~(7 << 17), // UPG_DEKU_STICKS
+    ~(7 << 20), // UPG_DEKU_NUTS
 };
 
 u8 gEquipShifts[] = {
@@ -61,25 +61,25 @@ u8 gEquipShifts[] = {
 };
 
 u8 gUpgradeShifts[] = {
-    0,  // Quivers
-    3,  // Bomb Bags
-    6,  // Unused (Strength)
-    9,  // Unused (Scale)
-    12, // Wallets
-    14, // Unused (Deku Seed Bullet Bags)
-    17, // Unused (Deku Stick)
-    20, // Unused (Deku Nut)
+    0,  // UPG_QUIVER
+    3,  // UPG_BOMB_BAG
+    6,  // UPG_STRENGTH
+    9,  // UPG_SCALE
+    12, // UPG_WALLET
+    14, // UPG_BULLET_BAG
+    17, // UPG_DEKU_STICKS
+    20, // UPG_DEKU_NUTS
 };
 
 u16 gUpgradeCapacities[][4] = {
-    { 0, 30, 40, 50 },     // Quivers
-    { 0, 20, 30, 40 },     // Bomb Bags
-    { 0, 0, 0, 0 },        // Unused (Strength)
-    { 0, 0, 0, 0 },        // Unused (Scale)
-    { 99, 200, 500, 500 }, // Wallets
-    { 0, 30, 40, 50 },     // Unused (Deku Seed Bullet Bags)
-    { 0, 10, 20, 30 },     // Unused (Deku Stick)
-    { 0, 20, 30, 40 },     // Unused (Deku Nut)
+    { 0, 30, 40, 50 },     // UPG_QUIVER
+    { 0, 20, 30, 40 },     // UPG_BOMB_BAG
+    { 0, 0, 0, 0 },        // UPG_STRENGTH
+    { 0, 0, 0, 0 },        // UPG_SCALE
+    { 99, 200, 500, 500 }, // UPG_WALLET
+    { 0, 30, 40, 50 },     // UPG_BULLET_BAG
+    { 0, 10, 20, 30 },     // UPG_DEKU_STICKS
+    { 0, 20, 30, 40 },     // UPG_DEKU_NUTS
 };
 
 // eight-bit masks
@@ -512,7 +512,7 @@ u8 Inventory_DeleteEquipment(PlayState* play, s16 equipment) {
 }
 
 void Inventory_ChangeUpgrade(s16 upgrade, u32 value) {
-    u32 upgrades = gSaveContext.save.saveInfo.inventory.upgrades;
+    u32 upgrades = GET_SAVE_INVENTORY_UPGRADES;
 
     upgrades &= gUpgradeNegMasks[upgrade];
     upgrades |= value << gUpgradeShifts[upgrade];
diff --git a/src/code/z_demo.c b/src/code/z_demo.c
index d6f3b78b3..262bc0ebc 100644
--- a/src/code/z_demo.c
+++ b/src/code/z_demo.c
@@ -301,7 +301,7 @@ void CutsceneCmd_Misc(PlayState* play, CutsceneContext* csCtx, CsCmdMisc* cmd) {
             break;
 
         case CS_MISC_PLAYER_FORM_HUMAN:
-            sCutsceneStoredPlayerForm = gSaveContext.save.playerForm;
+            sCutsceneStoredPlayerForm = GET_PLAYER_FORM;
             gSaveContext.save.playerForm = PLAYER_FORM_HUMAN;
             gSaveContext.save.equippedMask = PLAYER_MASK_NONE;
             break;
diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c
index a13499f46..0f1836dfb 100644
--- a/src/code/z_en_item00.c
+++ b/src/code/z_en_item00.c
@@ -1331,16 +1331,19 @@ void Item_DropCollectibleRandom(PlayState* play, Actor* fromActor, Vec3f* spawnP
         dropQuantity = sDropTableAmounts[params + dropTableIndex];
 
         if (dropId == ITEM00_MASK) {
-            switch (gSaveContext.save.playerForm) {
+            switch (GET_PLAYER_FORM) {
                 case PLAYER_FORM_HUMAN:
                     dropId = ITEM00_ARROWS_10;
                     break;
+
                 case PLAYER_FORM_ZORA:
                     dropId = ITEM00_RECOVERY_HEART;
                     break;
+
                 case PLAYER_FORM_GORON:
                     dropId = ITEM00_MAGIC_JAR_SMALL;
                     break;
+
                 default:
                     dropId = ITEM00_RUPEE_GREEN;
                     break;
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index a79071603..cbbe959e7 100644
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@@ -2020,10 +2020,10 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
         }
 
         // C buttons
-        if (gSaveContext.save.playerForm == player->transformation) {
+        if (GET_PLAYER_FORM == player->transformation) {
             for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) {
                 // Individual C button
-                if (!gPlayerFormItemRestrictions[(void)0, gSaveContext.save.playerForm][GET_CUR_FORM_BTN_ITEM(i)]) {
+                if (!gPlayerFormItemRestrictions[GET_PLAYER_FORM][GET_CUR_FORM_BTN_ITEM(i)]) {
                     // Item not usable in current playerForm
                     if (gSaveContext.buttonStatus[i] != BTN_DISABLED) {
                         gSaveContext.buttonStatus[i] = BTN_DISABLED;
@@ -2182,7 +2182,7 @@ void Interface_UpdateButtonsPart1(PlayState* play) {
     if (gSaveContext.save.cutsceneIndex < 0xFFF0) {
         gSaveContext.hudVisibilityForceButtonAlphasByStatus = false;
         if ((player->stateFlags1 & PLAYER_STATE1_800000) || CHECK_WEEKEVENTREG(WEEKEVENTREG_08_01) ||
-            (!(CHECK_EVENTINF(EVENTINF_41)) && (play->unk_1887C >= 2))) {
+            (!CHECK_EVENTINF(EVENTINF_41) && (play->unk_1887C >= 2))) {
             // Riding Epona OR Honey & Darling minigame OR Horseback balloon minigame OR related to swamp boat
             // (non-minigame?)
             if ((player->stateFlags1 & PLAYER_STATE1_800000) && (player->currentMask == PLAYER_MASK_BLAST) &&
@@ -2255,8 +2255,7 @@ void Interface_UpdateButtonsPart1(PlayState* play) {
                                (gSaveContext.save.entrance == ENTRANCE(ROMANI_RANCH, 0)) &&
                                (Cutscene_GetSceneLayer(play) != 0) && (play->transitionTrigger == TRANS_TRIGGER_OFF)) {
                         Interface_SetHudVisibility(HUD_VISIBILITY_A_B_MINIMAP);
-                    } else if ((gSaveContext.minigameStatus == MINIGAME_STATUS_ACTIVE) &&
-                               (CHECK_EVENTINF(EVENTINF_35))) {
+                    } else if ((gSaveContext.minigameStatus == MINIGAME_STATUS_ACTIVE) && CHECK_EVENTINF(EVENTINF_35)) {
                         Interface_SetHudVisibility(HUD_VISIBILITY_B_MINIMAP);
                     } else if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_82_08) &&
                                (gSaveContext.minigameStatus == MINIGAME_STATUS_ACTIVE)) {
@@ -2345,8 +2344,8 @@ void Interface_UpdateButtonsPart1(PlayState* play) {
                     restoreHudVisibility = true;
                     sPictoState = PICTO_BOX_STATE_OFF;
                 } else if (CHECK_BTN_ALL(CONTROLLER1(&play->state)->press.button, BTN_A) || (func_801A5100() == 1)) {
-                    if (!(CHECK_EVENTINF(EVENTINF_41)) ||
-                        ((CHECK_EVENTINF(EVENTINF_41)) && (CutsceneManager_GetCurrentCsId() == CS_ID_NONE))) {
+                    if (!CHECK_EVENTINF(EVENTINF_41) ||
+                        (CHECK_EVENTINF(EVENTINF_41) && (CutsceneManager_GetCurrentCsId() == CS_ID_NONE))) {
                         Audio_PlaySfx(NA_SE_SY_CAMERA_SHUTTER);
                         SREG(89) = 1;
                         play->haltAllActors = true;
@@ -3145,10 +3144,8 @@ void Inventory_UpdateDeitySwordEquip(PlayState* play) {
         interfaceCtx->unk_21C = 0;
         interfaceCtx->bButtonDoAction = 0;
 
-        // Is simply checking if (gSaveContext.save.playerForm == PLAYER_FORM_FIERCE_DEITY)
-        if ((((gSaveContext.save.playerForm > 0) && (gSaveContext.save.playerForm < 4))
-                 ? 1
-                 : gSaveContext.save.playerForm >> 1) == 0) {
+        // Is simply checking if (GET_PLAYER_FORM == PLAYER_FORM_FIERCE_DEITY)
+        if ((((GET_PLAYER_FORM > 0) && (GET_PLAYER_FORM < 4)) ? 1 : GET_PLAYER_FORM >> 1) == 0) {
             CUR_FORM_EQUIP(EQUIP_SLOT_B) = ITEM_SWORD_DEITY;
         } else if (CUR_FORM_EQUIP(EQUIP_SLOT_B) == ITEM_SWORD_DEITY) {
             if (GET_CUR_EQUIP_VALUE(EQUIP_TYPE_SWORD) == EQUIP_VALUE_SWORD_NONE) {
@@ -4104,7 +4101,7 @@ void Interface_DrawBButtonIcons(PlayState* play) {
                         (play->sceneId != SCENE_BOWLING) &&
                         ((gSaveContext.minigameStatus != MINIGAME_STATUS_ACTIVE) ||
                          (gSaveContext.save.entrance != ENTRANCE(ROMANI_RANCH, 0))) &&
-                        ((gSaveContext.minigameStatus != MINIGAME_STATUS_ACTIVE) || !(CHECK_EVENTINF(EVENTINF_35))) &&
+                        ((gSaveContext.minigameStatus != MINIGAME_STATUS_ACTIVE) || !CHECK_EVENTINF(EVENTINF_35)) &&
                         (!CHECK_WEEKEVENTREG(WEEKEVENTREG_31_80) || (play->unk_1887C != 100))) {
                         Interface_DrawAmmoCount(play, EQUIP_SLOT_B, interfaceCtx->bAlpha);
                     }
@@ -6409,7 +6406,7 @@ void Interface_Draw(PlayState* play) {
 
         Interface_DrawItemButtons(play);
 
-        if (player->transformation == ((void)0, gSaveContext.save.playerForm)) {
+        if (player->transformation == GET_PLAYER_FORM) {
             Interface_DrawBButtonIcons(play);
         }
         Interface_DrawCButtonIcons(play);
diff --git a/src/code/z_sram_NES.c b/src/code/z_sram_NES.c
index 33276f717..7e0caa640 100644
--- a/src/code/z_sram_NES.c
+++ b/src/code/z_sram_NES.c
@@ -800,16 +800,91 @@ ItemEquips sSaveDefaultItemEquips = {
 Inventory sSaveDefaultInventory = {
     // items
     {
-        ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE,
-        ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE,
-        ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE,
-        ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE,
-        ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE,
+        ITEM_NONE, // SLOT_OCARINA
+        ITEM_NONE, // SLOT_BOW
+        ITEM_NONE, // SLOT_ARROW_FIRE
+        ITEM_NONE, // SLOT_ARROW_ICE
+        ITEM_NONE, // SLOT_ARROW_LIGHT
+        ITEM_NONE, // SLOT_TRADE_DEED
+        ITEM_NONE, // SLOT_BOMB
+        ITEM_NONE, // SLOT_BOMBCHU
+        ITEM_NONE, // SLOT_DEKU_STICK
+        ITEM_NONE, // SLOT_DEKU_NUT
+        ITEM_NONE, // SLOT_MAGIC_BEANS
+        ITEM_NONE, // SLOT_TRADE_KEY_MAMA
+        ITEM_NONE, // SLOT_POWDER_KEG
+        ITEM_NONE, // SLOT_PICTOGRAPH_BOX
+        ITEM_NONE, // SLOT_LENS_OF_TRUTH
+        ITEM_NONE, // SLOT_HOOKSHOT
+        ITEM_NONE, // SLOT_SWORD_GREAT_FAIRY
+        ITEM_NONE, // SLOT_TRADE_COUPLE
+        ITEM_NONE, // SLOT_BOTTLE_1
+        ITEM_NONE, // SLOT_BOTTLE_2
+        ITEM_NONE, // SLOT_BOTTLE_3
+        ITEM_NONE, // SLOT_BOTTLE_4
+        ITEM_NONE, // SLOT_BOTTLE_5
+        ITEM_NONE, // SLOT_BOTTLE_6
+        ITEM_NONE, // SLOT_MASK_POSTMAN
+        ITEM_NONE, // SLOT_MASK_ALL_NIGHT
+        ITEM_NONE, // SLOT_MASK_BLAST
+        ITEM_NONE, // SLOT_MASK_STONE
+        ITEM_NONE, // SLOT_MASK_GREAT_FAIRY
+        ITEM_NONE, // SLOT_MASK_DEKU
+        ITEM_NONE, // SLOT_MASK_KEATON
+        ITEM_NONE, // SLOT_MASK_BREMEN
+        ITEM_NONE, // SLOT_MASK_BUNNY
+        ITEM_NONE, // SLOT_MASK_DON_GERO
+        ITEM_NONE, // SLOT_MASK_SCENTS
+        ITEM_NONE, // SLOT_MASK_GORON
+        ITEM_NONE, // SLOT_MASK_ROMANI
+        ITEM_NONE, // SLOT_MASK_CIRCUS_LEADER
+        ITEM_NONE, // SLOT_MASK_KAFEIS_MASK
+        ITEM_NONE, // SLOT_MASK_COUPLE
+        ITEM_NONE, // SLOT_MASK_TRUTH
+        ITEM_NONE, // SLOT_MASK_ZORA
+        ITEM_NONE, // SLOT_MASK_KAMARO
+        ITEM_NONE, // SLOT_MASK_GIBDO
+        ITEM_NONE, // SLOT_MASK_GARO
+        ITEM_NONE, // SLOT_MASK_CAPTAIN
+        ITEM_NONE, // SLOT_MASK_GIANT
+        ITEM_NONE, // SLOT_MASK_FIERCE_DEITY
     },
     // ammo
-    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    {
+        0, // SLOT_OCARINA
+        0, // SLOT_BOW
+        0, // SLOT_ARROW_FIRE
+        0, // SLOT_ARROW_ICE
+        0, // SLOT_ARROW_LIGHT
+        0, // SLOT_TRADE_DEED
+        0, // SLOT_BOMB
+        0, // SLOT_BOMBCHU
+        0, // SLOT_DEKU_STICK
+        0, // SLOT_DEKU_NUT
+        0, // SLOT_MAGIC_BEANS
+        0, // SLOT_TRADE_KEY_MAMA
+        0, // SLOT_POWDER_KEG
+        0, // SLOT_PICTOGRAPH_BOX
+        0, // SLOT_LENS_OF_TRUTH
+        0, // SLOT_HOOKSHOT
+        0, // SLOT_SWORD_GREAT_FAIRY
+        0, // SLOT_TRADE_COUPLE
+        0, // SLOT_BOTTLE_1
+        0, // SLOT_BOTTLE_2
+        0, // SLOT_BOTTLE_3
+        0, // SLOT_BOTTLE_4
+        0, // SLOT_BOTTLE_5
+        0, // SLOT_BOTTLE_6
+    },
     // upgrades
-    0x120000,
+    (0 << 0) |      // UPG_QUIVER
+        (0 << 3) |  // UPG_BOMB_BAG
+        (0 << 6) |  // UPG_STRENGTH
+        (0 << 9) |  // UPG_SCALE
+        (0 << 12) | // UPG_WALLET
+        (0 << 14) | // UPG_BULLET_BAG
+        (1 << 17) | // UPG_DEKU_STICKS
+        (1 << 20),  // UPG_DEKU_NUTS
     // questItems
     0,
     // dungeonItems
@@ -901,59 +976,91 @@ ItemEquips sSaveDebugItemEquips = {
 Inventory sSaveDebugInventory = {
     // items
     {
-        ITEM_OCARINA_OF_TIME,
-        ITEM_BOW,
-        ITEM_ARROW_FIRE,
-        ITEM_ARROW_ICE,
-        ITEM_ARROW_LIGHT,
-        ITEM_MOONS_TEAR,
-        ITEM_BOMB,
-        ITEM_BOMBCHU,
-        ITEM_DEKU_STICK,
-        ITEM_DEKU_NUT,
-        ITEM_MAGIC_BEANS,
-        ITEM_ROOM_KEY,
-        ITEM_POWDER_KEG,
-        ITEM_PICTOGRAPH_BOX,
-        ITEM_LENS_OF_TRUTH,
-        ITEM_HOOKSHOT,
-        ITEM_SWORD_GREAT_FAIRY,
-        ITEM_LETTER_TO_KAFEI,
-        ITEM_BOTTLE,
-        ITEM_POTION_RED,
-        ITEM_POTION_GREEN,
-        ITEM_POTION_BLUE,
-        ITEM_NONE,
-        ITEM_NONE,
-        ITEM_MASK_POSTMAN,
-        ITEM_MASK_ALL_NIGHT,
-        ITEM_MASK_BLAST,
-        ITEM_MASK_STONE,
-        ITEM_MASK_GREAT_FAIRY,
-        ITEM_MASK_DEKU,
-        ITEM_MASK_KEATON,
-        ITEM_MASK_BREMEN,
-        ITEM_MASK_BUNNY,
-        ITEM_MASK_DON_GERO,
-        ITEM_MASK_SCENTS,
-        ITEM_MASK_GORON,
-        ITEM_MASK_ROMANI,
-        ITEM_MASK_CIRCUS_LEADER,
-        ITEM_MASK_KAFEIS_MASK,
-        ITEM_MASK_COUPLE,
-        ITEM_MASK_TRUTH,
-        ITEM_MASK_ZORA,
-        ITEM_MASK_KAMARO,
-        ITEM_MASK_GIBDO,
-        ITEM_MASK_GARO,
-        ITEM_MASK_CAPTAIN,
-        ITEM_MASK_GIANT,
-        ITEM_MASK_FIERCE_DEITY,
+        ITEM_OCARINA_OF_TIME,    // SLOT_OCARINA
+        ITEM_BOW,                // SLOT_BOW
+        ITEM_ARROW_FIRE,         // SLOT_ARROW_FIRE
+        ITEM_ARROW_ICE,          // SLOT_ARROW_ICE
+        ITEM_ARROW_LIGHT,        // SLOT_ARROW_LIGHT
+        ITEM_MOONS_TEAR,         // SLOT_TRADE_DEED
+        ITEM_BOMB,               // SLOT_BOMB
+        ITEM_BOMBCHU,            // SLOT_BOMBCHU
+        ITEM_DEKU_STICK,         // SLOT_DEKU_STICK
+        ITEM_DEKU_NUT,           // SLOT_DEKU_NUT
+        ITEM_MAGIC_BEANS,        // SLOT_MAGIC_BEANS
+        ITEM_ROOM_KEY,           // SLOT_TRADE_KEY_MAMA
+        ITEM_POWDER_KEG,         // SLOT_POWDER_KEG
+        ITEM_PICTOGRAPH_BOX,     // SLOT_PICTOGRAPH_BOX
+        ITEM_LENS_OF_TRUTH,      // SLOT_LENS_OF_TRUTH
+        ITEM_HOOKSHOT,           // SLOT_HOOKSHOT
+        ITEM_SWORD_GREAT_FAIRY,  // SLOT_SWORD_GREAT_FAIRY
+        ITEM_LETTER_TO_KAFEI,    // SLOT_TRADE_COUPLE
+        ITEM_BOTTLE,             // SLOT_BOTTLE_1
+        ITEM_POTION_RED,         // SLOT_BOTTLE_2
+        ITEM_POTION_GREEN,       // SLOT_BOTTLE_3
+        ITEM_POTION_BLUE,        // SLOT_BOTTLE_4
+        ITEM_NONE,               // SLOT_BOTTLE_5
+        ITEM_NONE,               // SLOT_BOTTLE_6
+        ITEM_MASK_POSTMAN,       // SLOT_MASK_POSTMAN
+        ITEM_MASK_ALL_NIGHT,     // SLOT_MASK_ALL_NIGHT
+        ITEM_MASK_BLAST,         // SLOT_MASK_BLAST
+        ITEM_MASK_STONE,         // SLOT_MASK_STONE
+        ITEM_MASK_GREAT_FAIRY,   // SLOT_MASK_GREAT_FAIRY
+        ITEM_MASK_DEKU,          // SLOT_MASK_DEKU
+        ITEM_MASK_KEATON,        // SLOT_MASK_KEATON
+        ITEM_MASK_BREMEN,        // SLOT_MASK_BREMEN
+        ITEM_MASK_BUNNY,         // SLOT_MASK_BUNNY
+        ITEM_MASK_DON_GERO,      // SLOT_MASK_DON_GERO
+        ITEM_MASK_SCENTS,        // SLOT_MASK_SCENTS
+        ITEM_MASK_GORON,         // SLOT_MASK_GORON
+        ITEM_MASK_ROMANI,        // SLOT_MASK_ROMANI
+        ITEM_MASK_CIRCUS_LEADER, // SLOT_MASK_CIRCUS_LEADER
+        ITEM_MASK_KAFEIS_MASK,   // SLOT_MASK_KAFEIS_MASK
+        ITEM_MASK_COUPLE,        // SLOT_MASK_COUPLE
+        ITEM_MASK_TRUTH,         // SLOT_MASK_TRUTH
+        ITEM_MASK_ZORA,          // SLOT_MASK_ZORA
+        ITEM_MASK_KAMARO,        // SLOT_MASK_KAMARO
+        ITEM_MASK_GIBDO,         // SLOT_MASK_GIBDO
+        ITEM_MASK_GARO,          // SLOT_MASK_GARO
+        ITEM_MASK_CAPTAIN,       // SLOT_MASK_CAPTAIN
+        ITEM_MASK_GIANT,         // SLOT_MASK_GIANT
+        ITEM_MASK_FIERCE_DEITY,  // SLOT_MASK_FIERCE_DEITY
     },
     // ammo
-    { 1, 30, 1, 1, 1, 1, 30, 30, 30, 30, 1, 1, 1, 1, 30, 1, 1, 1, 1, 1, 1, 1, 0, 0 },
+    {
+        1,  // SLOT_OCARINA
+        30, // SLOT_BOW
+        1,  // SLOT_ARROW_FIRE
+        1,  // SLOT_ARROW_ICE
+        1,  // SLOT_ARROW_LIGHT
+        1,  // SLOT_TRADE_DEED
+        30, // SLOT_BOMB
+        30, // SLOT_BOMBCHU
+        30, // SLOT_DEKU_STICK
+        30, // SLOT_DEKU_NUT
+        1,  // SLOT_MAGIC_BEANS
+        1,  // SLOT_TRADE_KEY_MAMA
+        1,  // SLOT_POWDER_KEG
+        1,  // SLOT_PICTOGRAPH_BOX
+        30, // SLOT_LENS_OF_TRUTH
+        1,  // SLOT_HOOKSHOT
+        1,  // SLOT_SWORD_GREAT_FAIRY
+        1,  // SLOT_TRADE_COUPLE
+        1,  // SLOT_BOTTLE_1
+        1,  // SLOT_BOTTLE_2
+        1,  // SLOT_BOTTLE_3
+        1,  // SLOT_BOTTLE_4
+        0,  // SLOT_BOTTLE_5
+        0,  // SLOT_BOTTLE_6
+    },
     // upgrades
-    0x120009,
+    (1 << 0) |      // UPG_QUIVER
+        (1 << 3) |  // UPG_BOMB_BAG
+        (0 << 6) |  // UPG_STRENGTH
+        (0 << 9) |  // UPG_SCALE
+        (0 << 12) | // UPG_WALLET
+        (0 << 14) | // UPG_BULLET_BAG
+        (1 << 17) | // UPG_DEKU_STICKS
+        (1 << 20),  // UPG_DEKU_NUTS
     // questItems
     (1 << QUEST_SONG_SONATA) | (1 << QUEST_SONG_LULLABY) | (1 << QUEST_SONG_BOSSA_NOVA) | (1 << QUEST_SONG_ELEGY) |
         (1 << QUEST_SONG_OATH) | (1 << QUEST_SONG_TIME) | (1 << QUEST_SONG_HEALING) | (1 << QUEST_SONG_EPONA) |
@@ -991,12 +1098,20 @@ Inventory sSaveDebugInventory = {
 
 u16 sSaveDebugChecksum = 0;
 
-u8 D_801C6A48[] = {
-    ITEM_MASK_FIERCE_DEITY, ITEM_MASK_GORON, ITEM_MASK_ZORA, ITEM_MASK_DEKU, ITEM_MASK_FIERCE_DEITY,
+u8 D_801C6A48[PLAYER_FORM_MAX] = {
+    ITEM_MASK_FIERCE_DEITY, // PLAYER_FORM_FIERCE_DEITY
+    ITEM_MASK_GORON,        // PLAYER_FORM_GORON
+    ITEM_MASK_ZORA,         // PLAYER_FORM_ZORA
+    ITEM_MASK_DEKU,         // PLAYER_FORM_DEKU
+    ITEM_MASK_FIERCE_DEITY, // PLAYER_FORM_HUMAN
 };
 
-u8 D_801C6A50[] = {
-    SLOT_MASK_FIERCE_DEITY, SLOT_MASK_GORON, SLOT_MASK_ZORA, SLOT_MASK_DEKU, SLOT_MASK_FIERCE_DEITY,
+u8 D_801C6A50[PLAYER_FORM_MAX] = {
+    SLOT_MASK_FIERCE_DEITY, // PLAYER_FORM_FIERCE_DEITY
+    SLOT_MASK_GORON,        // PLAYER_FORM_GORON
+    SLOT_MASK_ZORA,         // PLAYER_FORM_ZORA
+    SLOT_MASK_DEKU,         // PLAYER_FORM_DEKU
+    SLOT_MASK_FIERCE_DEITY, // PLAYER_FORM_HUMAN
 };
 
 /**