From 9aefce8b0c48e728ba4f13b355636c1d7b132855 Mon Sep 17 00:00:00 2001
From: Aetias <aetias@outlook.com>
Date: Tue, 30 Apr 2024 18:06:10 +0200
Subject: [PATCH] Decomp `ItemManager::UpgradeBombBag`

---
 asm/ov00/Item/ItemManager.s      | 27 ---------------------------
 src/00_Core/Item/ItemManager.cpp |  5 +++++
 2 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/asm/ov00/Item/ItemManager.s b/asm/ov00/Item/ItemManager.s
index a06b1777..f9f76f00 100644
--- a/asm/ov00/Item/ItemManager.s
+++ b/asm/ov00/Item/ItemManager.s
@@ -3,33 +3,6 @@
 
 	.text
 
-	.global _ZN11ItemManager14UpgradeBombBagEv
-	thumb_func_start _ZN11ItemManager14UpgradeBombBagEv
-_ZN11ItemManager14UpgradeBombBagEv: ; 0x020ae484
-	push {r4, lr}
-	add r4, r0, #0
-	add r0, #0xb6
-	ldrh r0, [r0]
-	cmp r0, #2
-	bhs _020ae49e
-	add r0, r4, #0
-	add r0, #0xb6
-	ldrh r0, [r0]
-	add r1, r0, #1
-	add r0, r4, #0
-	add r0, #0xb6
-	strh r1, [r0]
-_020ae49e:
-	add r0, r4, #0
-	mov r1, #4
-	bl _ZNK11ItemManager10GetMaxAmmoEi
-	add r4, #0xb0
-	ldr r1, [r4]
-	strh r0, [r1, #8]
-	pop {r4, pc}
-	.align 2, 0
-	thumb_func_end _ZN11ItemManager14UpgradeBombBagEv
-
 	.global _ZN11ItemManager17UpgradeBombchuBagEv
 	thumb_func_start _ZN11ItemManager17UpgradeBombchuBagEv
 _ZN11ItemManager17UpgradeBombchuBagEv: ; 0x020ae4b0
diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp
index d98baa4a..b39663f2 100644
--- a/src/00_Core/Item/ItemManager.cpp
+++ b/src/00_Core/Item/ItemManager.cpp
@@ -832,3 +832,8 @@ THUMB void ItemManager::UpgradeQuiver() {
     if (mQuiverSize < MAX_AMMO_UPGRADE) mQuiverSize += 1;
     (*mAmmo)[ItemFlag_Bow] = this->GetMaxAmmo(ItemFlag_Bow);
 }
+
+THUMB void ItemManager::UpgradeBombBag() {
+    if (mBombBagSize < MAX_AMMO_UPGRADE) mBombBagSize += 1;
+    (*mAmmo)[ItemFlag_BombBag] = this->GetMaxAmmo(ItemFlag_BombBag);
+}