mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-05-26 23:47:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decomp ItemManager::HasItem

Browse Source
This commit is contained in:
Aetias
2024-02-18 12:53:12 +01:00
parent 116dffcaa5
commit f48b579b62
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/ov00/ItemManager/ItemManager.s
+1 -14
View File
@@ -3,19 +3,6 @@
.text
.global _ZNK11ItemManager7HasItemEj
arm_func_start _ZNK11ItemManager7HasItemEj
_ZNK11ItemManager7HasItemEj: ; 0x020ada78
mov r2, r1, lsr #0x5
add r0, r0, r2, lsl #2
ldr r2, [r0, #0x128]
and r1, r1, #0x1f
mov r0, #1
tst r2, r0, lsl r1
moveq r0, #0
bx lr
arm_func_end _ZNK11ItemManager7HasItemEj
.global _ZN11ItemManager7AddItemEj
thumb_func_start _ZN11ItemManager7AddItemEj
_ZN11ItemManager7AddItemEj: ; 0x020ada98
@@ -1279,7 +1266,7 @@ _ZN11ItemManager17EquipPreviousItemEv: ; 0x020ae3c0
bx ip
.align 2, 0
arm_func_end _ZN11ItemManager17EquipPreviousItemEv
_020ae3cc: .word _ZN11ItemManager15SetEquippedItemEj
_020ae3cc: .word _ZN11ItemManager15SetEquippedItemEj - 1
.global _ZN11ItemManager13ForceEquipItemEj
thumb_func_start _ZN11ItemManager13ForceEquipItemEj
src/ItemManager.cpp
+4
View File
@@ -357,3 +357,7 @@ ARM u32 ItemManager::GetFairyLevel(FairyId id) const {
if (this->HasItem(ItemFlag_FAIRY_LV1 + id)) return 1;
return 0;
}
ARM bool ItemManager::HasItem(ItemFlag item) const {
return GET_FLAG(this->mItemFlags.flags, item);
}