From c4fe373beb76bdbc039e791c8d3b8b2f5343dc3c Mon Sep 17 00:00:00 2001
From: Pablo <72659707+Pepe20129@users.noreply.github.com>
Date: Fri, 1 Aug 2025 18:01:22 +0200
Subject: [PATCH] Format

---
 include/upgrade.h      |  2 +-
 src/code/z_inventory.c | 32 ++++++++------------------------
 src/code/z_sram.c      | 26 ++++++--------------------
 3 files changed, 15 insertions(+), 45 deletions(-)

diff --git a/include/upgrade.h b/include/upgrade.h
index f0cd5fd4e5..d0e6af4142 100644
--- a/include/upgrade.h
+++ b/include/upgrade.h
@@ -160,4 +160,4 @@ static_assert(
 #define CAPACITY(upg, value) gUpgradeCapacities[upg][value]
 #define CUR_CAPACITY(upg) CAPACITY(upg, CUR_UPG_VALUE(upg))
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/code/z_inventory.c b/src/code/z_inventory.c
index 7b357c6347..eaea78bba1 100644
--- a/src/code/z_inventory.c
+++ b/src/code/z_inventory.c
@@ -31,25 +31,15 @@ u16 gEquipNegMasks[EQUIP_TYPE_MAX] = {
 };
 
 u32 gUpgradeMasks[UPG_MAX] = {
-    GET_UPGRADE_BITMASK(UPG_QUIVER),
-    GET_UPGRADE_BITMASK(UPG_BOMB_BAG),
-    GET_UPGRADE_BITMASK(UPG_STRENGTH),
-    GET_UPGRADE_BITMASK(UPG_SCALE),
-    GET_UPGRADE_BITMASK(UPG_WALLET),
-    GET_UPGRADE_BITMASK(UPG_BULLET_BAG),
-    GET_UPGRADE_BITMASK(UPG_DEKU_STICKS),
-    GET_UPGRADE_BITMASK(UPG_DEKU_NUTS),
+    GET_UPGRADE_BITMASK(UPG_QUIVER),      GET_UPGRADE_BITMASK(UPG_BOMB_BAG),  GET_UPGRADE_BITMASK(UPG_STRENGTH),
+    GET_UPGRADE_BITMASK(UPG_SCALE),       GET_UPGRADE_BITMASK(UPG_WALLET),    GET_UPGRADE_BITMASK(UPG_BULLET_BAG),
+    GET_UPGRADE_BITMASK(UPG_DEKU_STICKS), GET_UPGRADE_BITMASK(UPG_DEKU_NUTS),
 };
 
 u32 gUpgradeNegMasks[UPG_MAX] = {
-    ~GET_UPGRADE_BITMASK(UPG_QUIVER),
-    ~GET_UPGRADE_BITMASK(UPG_BOMB_BAG),
-    ~GET_UPGRADE_BITMASK(UPG_STRENGTH),
-    ~GET_UPGRADE_BITMASK(UPG_SCALE),
-    ~GET_UPGRADE_BITMASK(UPG_WALLET),
-    ~GET_UPGRADE_BITMASK(UPG_BULLET_BAG),
-    ~GET_UPGRADE_BITMASK(UPG_DEKU_STICKS),
-    ~GET_UPGRADE_BITMASK(UPG_DEKU_NUTS),
+    ~GET_UPGRADE_BITMASK(UPG_QUIVER),      ~GET_UPGRADE_BITMASK(UPG_BOMB_BAG),  ~GET_UPGRADE_BITMASK(UPG_STRENGTH),
+    ~GET_UPGRADE_BITMASK(UPG_SCALE),       ~GET_UPGRADE_BITMASK(UPG_WALLET),    ~GET_UPGRADE_BITMASK(UPG_BULLET_BAG),
+    ~GET_UPGRADE_BITMASK(UPG_DEKU_STICKS), ~GET_UPGRADE_BITMASK(UPG_DEKU_NUTS),
 };
 
 u8 gEquipShifts[EQUIP_TYPE_MAX] = {
@@ -60,14 +50,8 @@ u8 gEquipShifts[EQUIP_TYPE_MAX] = {
 };
 
 u8 gUpgradeShifts[UPG_MAX] = {
-    SHIFT_UPG_QUIVER,
-    SHIFT_UPG_BOMB_BAG,
-    SHIFT_UPG_STRENGTH,
-    SHIFT_UPG_SCALE,
-    SHIFT_UPG_WALLET,
-    SHIFT_UPG_BULLET_BAG,
-    SHIFT_UPG_DEKU_STICKS,
-    SHIFT_UPG_DEKU_NUTS,
+    SHIFT_UPG_QUIVER, SHIFT_UPG_BOMB_BAG,   SHIFT_UPG_STRENGTH,    SHIFT_UPG_SCALE,
+    SHIFT_UPG_WALLET, SHIFT_UPG_BULLET_BAG, SHIFT_UPG_DEKU_STICKS, SHIFT_UPG_DEKU_NUTS,
 };
 
 u16 gUpgradeCapacities[UPG_MAX][4] = {
diff --git a/src/code/z_sram.c b/src/code/z_sram.c
index 3ba7833e5c..91ee654634 100644
--- a/src/code/z_sram.c
+++ b/src/code/z_sram.c
@@ -185,16 +185,9 @@ static Inventory sNewSaveInventory = {
     // equipment
     (((1 << EQUIP_INV_TUNIC_KOKIRI) << (EQUIP_TYPE_TUNIC * 4)) |
      ((1 << EQUIP_INV_BOOTS_KOKIRI) << (EQUIP_TYPE_BOOTS * 4))),
-    GET_PACKED_UPGRADES_VALUE(
-        UPG_QUIVER_NONE,
-        UPG_BOMB_BAG_NONE,
-        UPG_STRENGTH_NONE,
-        UPG_SCALE_NONE,
-        UPG_WALLET_CHILD,
-        UPG_BULLET_BAG_NONE,
-        UPG_DEKU_STICKS_NONE,
-        UPG_DEKU_NUTS_NONE
-    ),                                                              // upgrades
+    GET_PACKED_UPGRADES_VALUE(UPG_QUIVER_NONE, UPG_BOMB_BAG_NONE, UPG_STRENGTH_NONE, UPG_SCALE_NONE, UPG_WALLET_CHILD,
+                              UPG_BULLET_BAG_NONE, UPG_DEKU_STICKS_NONE,
+                              UPG_DEKU_NUTS_NONE),                  // upgrades
     0,                                                              // questItems
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // dungeonItems
     {
@@ -354,16 +347,9 @@ static Inventory sDebugSaveInventory = {
      (((1 << EQUIP_INV_BOOTS_KOKIRI) << (EQUIP_TYPE_BOOTS * 4)) |
       ((1 << EQUIP_INV_BOOTS_IRON) << (EQUIP_TYPE_BOOTS * 4)) |
       ((1 << EQUIP_INV_BOOTS_HOVER) << (EQUIP_TYPE_BOOTS * 4)))),
-    GET_PACKED_UPGRADES_VALUE(
-        UPG_QUIVER_NORMAL,
-        UPG_BOMB_BAG_NORMAL,
-        UPG_STRENGTH_GORON_BRACELET,
-        UPG_SCALE_SILVER,
-        UPG_WALLET_ADULT,
-        UPG_BULLET_BAG_NORMAL,
-        UPG_DEKU_STICKS_10,
-        UPG_DEKU_NUTS_20
-    ),                                                              // upgrades
+    GET_PACKED_UPGRADES_VALUE(UPG_QUIVER_NORMAL, UPG_BOMB_BAG_NORMAL, UPG_STRENGTH_GORON_BRACELET, UPG_SCALE_SILVER,
+                              UPG_WALLET_ADULT, UPG_BULLET_BAG_NORMAL, UPG_DEKU_STICKS_10,
+                              UPG_DEKU_NUTS_20),                    // upgrades
     0x1E3FFFF,                                                      // questItems
     { 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // dungeonItems
     { 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8 },    // dungeonKeys