From 4b73ee6f89910419f8365a9c15b9723ce0706fba Mon Sep 17 00:00:00 2001
From: Aetias <aetias@outlook.com>
Date: Mon, 13 Nov 2023 23:23:03 +0100
Subject: [PATCH] Decomp `Inventory::ClearPrevEquippedItem`

---
 asm/global.inc        | 2 +-
 asm/ov00/inventory.s  | 9 ---------
 asm/ov04.s            | 2 +-
 include/Inventory.hpp | 4 +++-
 src/Inventory.cpp     | 7 +++++++
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/asm/global.inc b/asm/global.inc
index 724efd0a..4877fe70 100644
--- a/asm/global.inc
+++ b/asm/global.inc
@@ -264285,7 +264285,7 @@
 .extern func_ov00_020ad0a8
 .extern _ZN9Inventory7DestroyEv
 .extern func_ov00_020ad0ce
-.extern func_ov00_020ad0dc
+.extern _ZN9Inventory21ClearPrevEquippedItemEv
 .extern func_ov00_020ad0e4
 .extern func_ov00_020ad104
 .extern func_ov00_020ad160
diff --git a/asm/ov00/inventory.s b/asm/ov00/inventory.s
index 2f503801..3fa4afec 100644
--- a/asm/ov00/inventory.s
+++ b/asm/ov00/inventory.s
@@ -3,15 +3,6 @@
 
 	.text
 
-	.global func_ov00_020ad0dc
-	thumb_func_start func_ov00_020ad0dc
-func_ov00_020ad0dc: ; 0x020ad0dc
-	mov r1, #0
-	mvn r1, r1
-	str r1, [r0, #4]
-	bx lr
-	thumb_func_end func_ov00_020ad0dc
-
 	.global func_ov00_020ad0e4
 	thumb_func_start func_ov00_020ad0e4
 func_ov00_020ad0e4: ; 0x020ad0e4
diff --git a/asm/ov04.s b/asm/ov04.s
index bd7327da..9085e99f 100644
--- a/asm/ov04.s
+++ b/asm/ov04.s
@@ -14965,7 +14965,7 @@ _02107ef6:
 	bl func_ov00_020aef30
 	ldr r0, _02107f2c ; =gInventory
 	ldr r0, [r0]
-	bl func_ov00_020ad0dc
+	bl _ZN9Inventory21ClearPrevEquippedItemEv
 	add r0, r4, #0
 	bl func_ov00_020b8060
 	mov r0, #4
diff --git a/include/Inventory.hpp b/include/Inventory.hpp
index 5b1feed9..82cc953d 100644
--- a/include/Inventory.hpp
+++ b/include/Inventory.hpp
@@ -5,7 +5,7 @@
 
 typedef u32 EquipItem;
 enum EquipItem_ {
-    EquipItem_None          = 0,
+    EquipItem_None          = -1,
     EquipItem_Boomerang     = 2,
     EquipItem_Shovel        = 3,
     EquipItem_Bomb          = 4,
@@ -66,6 +66,8 @@ public:
     static void Destroy();
     Inventory();
     ~Inventory();
+
+    void ClearPrevEquippedItem();
 };
 
 extern Inventory *gInventory;
diff --git a/src/Inventory.cpp b/src/Inventory.cpp
index 3f59a4ea..6708de0f 100644
--- a/src/Inventory.cpp
+++ b/src/Inventory.cpp
@@ -12,4 +12,11 @@ void Inventory::Destroy() {
     delete gInventory;
     gInventory = 0;
 }
+
+#pragma interworking on
+void Inventory::ClearPrevEquippedItem() {
+    this->mPrevEquippedItem = EquipItem_None;
+}
+#pragma interworking off
+
 #pragma thumb off