mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-05-24 15:20:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decomp ItemManager::ClearForcedEquipItem

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