diff --git a/asm/ov00/Item/ItemManager.s b/asm/ov00/Item/ItemManager.s index f9f76f00..e63e6ce9 100644 --- a/asm/ov00/Item/ItemManager.s +++ b/asm/ov00/Item/ItemManager.s @@ -3,33 +3,6 @@ .text - .global _ZN11ItemManager17UpgradeBombchuBagEv - thumb_func_start _ZN11ItemManager17UpgradeBombchuBagEv -_ZN11ItemManager17UpgradeBombchuBagEv: ; 0x020ae4b0 - push {r4, lr} - add r4, r0, #0 - add r0, #0xb8 - ldrh r0, [r0] - cmp r0, #2 - bhs _020ae4ca - add r0, r4, #0 - add r0, #0xb8 - ldrh r0, [r0] - add r1, r0, #1 - add r0, r4, #0 - add r0, #0xb8 - strh r1, [r0] -_020ae4ca: - add r0, r4, #0 - mov r1, #7 - bl _ZNK11ItemManager10GetMaxAmmoEi - add r4, #0xb0 - ldr r1, [r4] - strh r0, [r1, #0xe] - pop {r4, pc} - .align 2, 0 - thumb_func_end _ZN11ItemManager17UpgradeBombchuBagEv - .global _ZN11ItemManager18func_ov00_020ae4dcEj arm_func_start _ZN11ItemManager18func_ov00_020ae4dcEj _ZN11ItemManager18func_ov00_020ae4dcEj: ; 0x020ae4dc diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp index b39663f2..7b7db21f 100644 --- a/src/00_Core/Item/ItemManager.cpp +++ b/src/00_Core/Item/ItemManager.cpp @@ -837,3 +837,8 @@ THUMB void ItemManager::UpgradeBombBag() { if (mBombBagSize < MAX_AMMO_UPGRADE) mBombBagSize += 1; (*mAmmo)[ItemFlag_BombBag] = this->GetMaxAmmo(ItemFlag_BombBag); } + +THUMB void ItemManager::UpgradeBombchuBag() { + if (mBombchuBagSize < MAX_AMMO_UPGRADE) mBombchuBagSize += 1; + (*mAmmo)[ItemFlag_BombchuBag] = this->GetMaxAmmo(ItemFlag_BombchuBag); +}