From 458ede60df2dcb919372888e94e4b1fc5d691afb Mon Sep 17 00:00:00 2001 From: Aetias Date: Tue, 30 Apr 2024 18:03:06 +0200 Subject: [PATCH] Decomp `ItemManager::UpdateSwordShieldInUse` --- asm/ov00/Item/ItemManager.s | 21 --------------------- src/00_Core/Item/ItemManager.cpp | 5 +++++ 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/asm/ov00/Item/ItemManager.s b/asm/ov00/Item/ItemManager.s index b997146d..84a6b996 100644 --- a/asm/ov00/Item/ItemManager.s +++ b/asm/ov00/Item/ItemManager.s @@ -3,27 +3,6 @@ .text - .global _ZN11ItemManager22UpdateSwordShieldInUseEv - arm_func_start _ZN11ItemManager22UpdateSwordShieldInUseEv -_ZN11ItemManager22UpdateSwordShieldInUseEv: ; 0x020ae418 - stmdb sp!, {r4, lr} - mov r1, #0 - mov r4, r0 - bl _ZN11ItemManager12GetEquipItemEi - ldr r2, [r0] - mov r1, #1 - ldr r2, [r2, #0x28] - blx r2 - mov r0, r4 - mov r1, #1 - bl _ZN11ItemManager12GetEquipItemEi - ldr r2, [r0] - mov r1, #1 - ldr r2, [r2, #0x28] - blx r2 - ldmia sp!, {r4, pc} - arm_func_end _ZN11ItemManager22UpdateSwordShieldInUseEv - .global _ZN11ItemManager13UpgradeQuiverEv thumb_func_start _ZN11ItemManager13UpgradeQuiverEv _ZN11ItemManager13UpgradeQuiverEv: ; 0x020ae458 diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp index 31a40585..d5c88bb3 100644 --- a/src/00_Core/Item/ItemManager.cpp +++ b/src/00_Core/Item/ItemManager.cpp @@ -822,3 +822,8 @@ THUMB bool ItemManager::ClearForcedEquipItem() { if (mEquippedItem != ItemFlag_None) return this->SetEquippedItem(mEquippedItem); return false; } + +ARM void ItemManager::UpdateSwordShieldInUse() { + this->GetEquipItem(ItemFlag_OshusSword)->UpdateInUse(1); + this->GetEquipItem(ItemFlag_WoodenShield)->UpdateInUse(1); +}