mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-06-04 10:48:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decomp ItemManager::UpdateSwordShieldInUse

Browse Source
This commit is contained in:
Aetias
2024-04-30 18:03:06 +02:00
parent b8ffab37ab
commit 458ede60df
2 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/ov00/Item/ItemManager.s
-21
View File
@@ -3,27 +3,6 @@
.text
.global _ZN11ItemManager22UpdateSwordShieldInUseEv
arm_func_start _ZN11ItemManager22UpdateSwordShieldInUseEv
_ZN11ItemManager22UpdateSwordShieldInUseEv: ; 0x020ae418
stmdb sp!, {r4, lr}
mov r1, #0
mov r4, r0
bl _ZN11ItemManager12GetEquipItemEi
ldr r2, [r0]
mov r1, #1
ldr r2, [r2, #0x28]
blx r2
mov r0, r4
mov r1, #1
bl _ZN11ItemManager12GetEquipItemEi
ldr r2, [r0]
mov r1, #1
ldr r2, [r2, #0x28]
blx r2
ldmia sp!, {r4, pc}
arm_func_end _ZN11ItemManager22UpdateSwordShieldInUseEv
.global _ZN11ItemManager13UpgradeQuiverEv
thumb_func_start _ZN11ItemManager13UpgradeQuiverEv
_ZN11ItemManager13UpgradeQuiverEv: ; 0x020ae458
src/00_Core/Item/ItemManager.cpp
+5
View File
@@ -822,3 +822,8 @@ THUMB bool ItemManager::ClearForcedEquipItem() {
if (mEquippedItem != ItemFlag_None) return this->SetEquippedItem(mEquippedItem);
return false;
}
ARM void ItemManager::UpdateSwordShieldInUse() {
this->GetEquipItem(ItemFlag_OshusSword)->UpdateInUse(1);
this->GetEquipItem(ItemFlag_WoodenShield)->UpdateInUse(1);
}