mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-07-09 06:03:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decomp ItemManager::EquipItem_vfunc_2c

Browse Source
This commit is contained in:
Aetias
2024-02-17 00:39:00 +01:00
parent 7f50862f8f
commit 91643888ca
4 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/ov00/ItemManager/ItemManager.s
-12
View File
@@ -3,18 +3,6 @@
.text
.global _ZN11ItemManager17EquipItem_vfunc_2cEj
arm_func_start _ZN11ItemManager17EquipItem_vfunc_2cEj
_ZN11ItemManager17EquipItem_vfunc_2cEj: ; 0x020ad6f8
stmdb sp!, {r3, lr}
ldr r0, [r0, #0xac]
ldr r0, [r0, r1, lsl #2]
ldr r1, [r0]
ldr r1, [r1, #0x2c]
blx r1
ldmia sp!, {r3, pc}
arm_func_end _ZN11ItemManager17EquipItem_vfunc_2cEj
.global _ZN11ItemManager12GetEquipItemEj
arm_func_start _ZN11ItemManager12GetEquipItemEj
_ZN11ItemManager12GetEquipItemEj: ; 0x020ad714
asm/ov00/include/ov00_020a03e4.inc
+1 -1
View File
@@ -556,7 +556,7 @@
.extern func_ov00_0208f030
.extern gItemManager
.extern _ZN11ItemManager18EquipItem_vfunc_3cEP5Vec4pj
.extern _ZN11ItemManager17EquipItem_vfunc_2cEj
.extern _ZN11ItemManager18EquipItem_vfunc_2cEj
.extern gItemManager
.extern func_ov00_02083624
.extern data_027e0e60
asm/ov00/ov00_020a03e4.s
+1 -1
View File
@@ -9668,7 +9668,7 @@ func_ov00_020a7cfc: ; 0x020a7cfc
ldmeqia sp!, {r3, pc}
ldr r0, _020a7d30 ; =gItemManager
ldr r0, [r0]
bl _ZN11ItemManager17EquipItem_vfunc_2cEj
bl _ZN11ItemManager18EquipItem_vfunc_2cEj
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020a7cfc
src/ItemManager.cpp
+4
View File
@@ -249,3 +249,7 @@ bool ItemManager::EquipItem_vfunc_3c(Vec4p *param1, ItemFlag equipId) {
}
return false;
}
void ItemManager::EquipItem_vfunc_2c(ItemFlag equipId) {
(*this->mEquipItems)[equipId]->vfunc_2c();
}