diff --git a/asm/ov00/ItemManager/ItemManager.s b/asm/ov00/ItemManager/ItemManager.s index 528b3537..2110be7f 100644 --- a/asm/ov00/ItemManager/ItemManager.s +++ b/asm/ov00/ItemManager/ItemManager.s @@ -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 diff --git a/asm/ov00/include/ov00_020a03e4.inc b/asm/ov00/include/ov00_020a03e4.inc index c1deb8e5..22068091 100644 --- a/asm/ov00/include/ov00_020a03e4.inc +++ b/asm/ov00/include/ov00_020a03e4.inc @@ -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 diff --git a/asm/ov00/ov00_020a03e4.s b/asm/ov00/ov00_020a03e4.s index b4839d50..3fca3754 100644 --- a/asm/ov00/ov00_020a03e4.s +++ b/asm/ov00/ov00_020a03e4.s @@ -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 diff --git a/src/ItemManager.cpp b/src/ItemManager.cpp index 5356ec77..dd5a6a02 100644 --- a/src/ItemManager.cpp +++ b/src/ItemManager.cpp @@ -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(); +}