From f316b2ecd78381d935a63518c919cff55df939d3 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Sat, 2 Aug 2025 19:22:40 +0200 Subject: [PATCH] format --- include/Item/Item.hpp | 48 ++++++++++++++--------------- src/000_Second/Item/ItemManager.cpp | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/include/Item/Item.hpp b/include/Item/Item.hpp index ea8696a4..8142925d 100644 --- a/include/Item/Item.hpp +++ b/include/Item/Item.hpp @@ -63,25 +63,25 @@ enum ItemId_ { ItemId_HeartContainer = 40, ItemId_QuiverMedium = 41, ItemId_BombBagMedium = 42, - ItemId_ForceGem_43 = 43, // one of rightmost forest - ItemId_ForceGem_44 = 44, // the other rightmost forest, but more middle than top - ItemId_ForceGem_45 = 45, // the bottom-rightmost forest - ItemId_ForceGem_46 = 46, // the top-rightmost fire - ItemId_ForceGem_47 = 47, // the center forest - ItemId_ForceGem_48 = 48, // the middle-left forest - ItemId_ForceGem_49 = 49, // the below middle-left forest - ItemId_ForceGem_50 = 50, - ItemId_ForceGem_51 = 51, - ItemId_ForceGem_52 = 52, - ItemId_ForceGem_53 = 53, - ItemId_ForceGem_54 = 54, - ItemId_ForceGem_55 = 55, - ItemId_ForceGem_56 = 56, - ItemId_ForceGem_57 = 57, - ItemId_ForceGem_58 = 58, - ItemId_ForceGem_59 = 59, - ItemId_ForceGem_60 = 60, - ItemId_ForceGem_61 = 61, + ItemId_ForceGem_43 = 43, // one of rightmost forest + ItemId_ForceGem_44 = 44, // the other rightmost forest, but more middle than top + ItemId_ForceGem_45 = 45, // the bottom-rightmost forest + ItemId_ForceGem_46 = 46, // the top-rightmost fire + ItemId_ForceGem_47 = 47, // the center forest + ItemId_ForceGem_48 = 48, // the middle-left forest + ItemId_ForceGem_49 = 49, // the below middle-left forest + ItemId_ForceGem_50 = 50, + ItemId_ForceGem_51 = 51, + ItemId_ForceGem_52 = 52, + ItemId_ForceGem_53 = 53, + ItemId_ForceGem_54 = 54, + ItemId_ForceGem_55 = 55, + ItemId_ForceGem_56 = 56, + ItemId_ForceGem_57 = 57, + ItemId_ForceGem_58 = 58, + ItemId_ForceGem_59 = 59, + ItemId_ForceGem_60 = 60, + ItemId_ForceGem_61 = 61, ItemId_PanFlute = 62, ItemId_StampBook = 63, ItemId_LightBow = 64, @@ -121,11 +121,11 @@ enum ItemId_ { ItemId_SuperSpinScroll = 98, ItemId_BeamScroll = 99, ItemId_LinebeckLetter = 100, - ItemId_PanFluteSong_101 = 101, - ItemId_PanFluteSong_102 = 102, - ItemId_PanFluteSong_103 = 103, - ItemId_PanFluteSong_104 = 104, - ItemId_PanFluteSong_105 = 105, + ItemId_PanFluteSong_101 = 101, + ItemId_PanFluteSong_102 = 102, + ItemId_PanFluteSong_103 = 103, + ItemId_PanFluteSong_104 = 104, + ItemId_PanFluteSong_105 = 105, ItemId_RabbitNet = 106, ItemId_BeedleCard = 107, ItemId_SilverCard = 108, diff --git a/src/000_Second/Item/ItemManager.cpp b/src/000_Second/Item/ItemManager.cpp index 875005cc..ebb8e2aa 100644 --- a/src/000_Second/Item/ItemManager.cpp +++ b/src/000_Second/Item/ItemManager.cpp @@ -73,7 +73,7 @@ ARM void ItemManager::func_ov000_020a87ec(s32 amount) { // gainBombs ARM void ItemManager::func_ov000_020a8820(s32 amount) { - s32 maxBombs = this->func_ov000_020a8748(); + s32 maxBombs = this->func_ov000_020a8748(); s32 newAmount = this->mBombAmount + amount; if (newAmount > maxBombs) {