From 5d78a5c00e8cf6f4f793086b06d0b75a95df3acf Mon Sep 17 00:00:00 2001 From: Aetias Date: Tue, 30 Apr 2024 17:50:59 +0200 Subject: [PATCH] Decomp `ItemManager::GetEquippedItem` --- asm/ov00/Item/ItemManager.s | 10 ---------- src/00_Core/Item/ItemManager.cpp | 5 +++++ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/asm/ov00/Item/ItemManager.s b/asm/ov00/Item/ItemManager.s index 07ae53b7..eef1c36f 100644 --- a/asm/ov00/Item/ItemManager.s +++ b/asm/ov00/Item/ItemManager.s @@ -2,16 +2,6 @@ .include "ov00/Item/ItemManager.inc" .text - .global _ZNK11ItemManager15GetEquippedItemEv - arm_func_start _ZNK11ItemManager15GetEquippedItemEv -_ZNK11ItemManager15GetEquippedItemEv: ; 0x020ae390 - ldr r2, [r0, #8] - mvn r1, #0 - cmp r2, r1 - ldreq r2, [r0] - mov r0, r2 - bx lr - arm_func_end _ZNK11ItemManager15GetEquippedItemEv .global _ZN11ItemManager15SetEquippedItemEi arm_func_start _ZN11ItemManager15SetEquippedItemEi diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp index ac550e81..892478c3 100644 --- a/src/00_Core/Item/ItemManager.cpp +++ b/src/00_Core/Item/ItemManager.cpp @@ -791,3 +791,8 @@ THUMB void ItemManager::GiveKeys(u32 amount) { if (keys <= 0) keys = 0; gMapManager->SetNumKeys(keys); } + +ARM ItemFlag ItemManager::GetEquippedItem() const { + if (this->mForcedItem != ItemFlag_None) return this->mForcedItem; + return this->mEquippedItem; +}