From b8ffab37abca9f44c731d1e0fdf1dfb9322f71fa Mon Sep 17 00:00:00 2001
From: Aetias <aetias@outlook.com>
Date: Tue, 30 Apr 2024 18:02:03 +0200
Subject: [PATCH] Decomp `ItemManager::ClearForcedEquipItem`

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

diff --git a/asm/ov00/Item/ItemManager.s b/asm/ov00/Item/ItemManager.s
index d93b94e6..b997146d 100644
--- a/asm/ov00/Item/ItemManager.s
+++ b/asm/ov00/Item/ItemManager.s
@@ -3,23 +3,6 @@
 
 	.text
 
-	.global _ZN11ItemManager20ClearForcedEquipItemEv
-	thumb_func_start _ZN11ItemManager20ClearForcedEquipItemEv
-_ZN11ItemManager20ClearForcedEquipItemEv: ; 0x020ae400
-	push {r3, lr}
-	mov r2, #0
-	mvn r2, r2
-	str r2, [r0, #8]
-	ldr r1, [r0]
-	cmp r1, r2
-	beq _020ae414
-	blx _ZN11ItemManager15SetEquippedItemEi
-	pop {r3, pc}
-_020ae414:
-	mov r0, #0
-	pop {r3, pc}
-	thumb_func_end _ZN11ItemManager20ClearForcedEquipItemEv
-
 	.global _ZN11ItemManager22UpdateSwordShieldInUseEv
 	arm_func_start _ZN11ItemManager22UpdateSwordShieldInUseEv
 _ZN11ItemManager22UpdateSwordShieldInUseEv: ; 0x020ae418
diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp
index 82c30210..31a40585 100644
--- a/src/00_Core/Item/ItemManager.cpp
+++ b/src/00_Core/Item/ItemManager.cpp
@@ -816,3 +816,9 @@ THUMB void ItemManager::ForceEquipItem(ItemFlag equipId) {
     mForcedItem = equipId;
     mEquipLoadTimer = 1;
 }
+
+THUMB bool ItemManager::ClearForcedEquipItem() {
+    mForcedItem = ItemFlag_None;
+    if (mEquippedItem != ItemFlag_None) return this->SetEquippedItem(mEquippedItem);
+    return false;
+}