cleanup actornavibase and match ActorNavi::func_ov059_0219b020

This commit is contained in:
Yanis002
2025-02-08 12:40:01 +01:00
parent cf757250b0
commit bd747975ff
5 changed files with 61 additions and 40 deletions
+1 -1
View File
@@ -12,7 +12,7 @@ void ActorNaviBase::func_ov000_020b8c50() {}
void ActorNaviBase::func_ov000_020b8c98(unk32 param1, unk32 param2, unk32 param3) {}
void ActorNaviBase::vfunc_d4() {}
void ActorNaviBase::vfunc_d8() {}
void ActorNaviBase::SetActive(bool active) {}
void ActorNaviBase::SetActive(unk32 active) {}
void ActorNaviBase::TeleportAboveLink() {}
void ActorNaviBase::vfunc_e0() {}
void ActorNaviBase::vfunc_e4() {}
+27 -7
View File
@@ -1,9 +1,29 @@
#include "Actor/Navi/ActorNaviBase.hpp"
#include "Actor/Navi/ActorNavi.hpp"
#include "Player/PlayerControl.hpp"
#include "Item/ItemManager.hpp"
bool ActorNaviBase::func_ov059_0219933c(u32 param1) {}
void ActorNaviBase::func_ov059_0219a0ac() {}
void ActorNaviBase::func_ov059_0219aa08() {}
void ActorNaviBase::func_ov059_0219aba8(u32 param1) {}
bool ActorNaviBase::func_ov059_0219af14() {}
bool ActorNaviBase::func_ov059_0219afc4() {}
void ActorNaviBase::func_ov059_0219b020() {}
ARM bool ActorNavi::func_ov059_0219933c(u32 param1) {}
ARM void ActorNavi::func_ov059_0219a0ac() {}
ARM void ActorNavi::func_ov059_0219aa08() {}
ARM void ActorNavi::func_ov059_0219aba8(u32 param1) {}
ARM bool ActorNavi::func_ov059_0219af14() {}
ARM bool ActorNavi::func_ov059_0219afc4() {}
ARM void ActorNavi::func_ov059_0219b020() {
if (gItemManager->GetEquippedFairy() != FairyId_Courage) {
ItemManager* itemMgr = gItemManager;
this->mPrevPos = this->mUnk_158 = this->mPos = itemMgr->GetFairy(itemMgr->GetEquippedFairy())->mPos;
} else {
this->mUnk_158 = this->mPos;
}
gPlayerControl->mAimWorld = this->mUnk_158;
this->mHammer = GetEquipHammer();
this->mUnk_3c0[0] = 0x0;
this->mUnk_3c0[2] = 0x0;
this->SetActive(3);
}