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

Rename EquipCollidesWith, Cylinder::Overlaps

Browse Source
This commit is contained in:
Aetias
2024-05-23 18:52:36 +02:00
parent 502425ad80
commit c779b21215
32 changed files with 62 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/00_Core/Item/ItemManager.cpp
+5 -5
View File
@@ -199,14 +199,14 @@ ARM void ItemManager::EquipItem_vfunc_38(unk32 param1) {
(*mEquipItems)[equip]->vfunc_38(param1);
}
ARM bool ItemManager::EquipItem_vfunc_3c(Vec4p *param1, ItemFlag equipId) {
Vec4p result;
if ((*mEquipItems)[equipId]->vfunc_3c(&result)) {
ARM bool ItemManager::EquipCollidesWith(Cylinder *hitbox, ItemFlag equipId) {
Cylinder equipHitbox;
if ((*mEquipItems)[equipId]->GetHitbox(&equipHitbox)) {
s32 step = (*mEquipItems)[equipId]->vfunc_4c();
if (step > 0) {
Approach_thunk(&result.y, param1->y, step);
Approach_thunk(&equipHitbox.pos.y, hitbox->pos.y, step);
}
return func_01ffec34(param1, &result);
return hitbox->Overlaps(&equipHitbox);
}
return false;
}