mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-06-05 11:17:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decomp ItemManager::GetEquippedItem

Browse Source
This commit is contained in:
Aetias
2024-04-30 17:50:59 +02:00
parent 840c6f8538
commit 5d78a5c00e
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/ov00/Item/ItemManager.s
-10
View File
@@ -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
src/00_Core/Item/ItemManager.cpp
+5
View File
@@ -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;
}