This commit is contained in:
Yanis002
2025-07-01 01:15:32 +02:00
parent 084e61c777
commit 289e9153e6
2 changed files with 8 additions and 8 deletions
+4 -4
View File
@@ -175,8 +175,8 @@ ARM void ActorNavi::func_ov059_0219aba8(u32 param1) {
local_56 = local_5c;
if (gMapManager->func_01ffbf5c(&auStack_80, &local_110, &local_11c, this->mUnk_08c.size) ? false : true) {
this->mPos = local_e4;
this->mPrevPos = local_e4;
this->mPos = local_e4;
this->mPrevPos = local_e4;
this->mOffsetPos = local_e4;
} else {
this->mOffsetPos.x = uVar4;
@@ -230,8 +230,8 @@ ARM void ActorNavi::func_ov059_0219aba8(u32 param1) {
}
if (!bVar7) {
this->mPos = auStack_e0.mUnk_14;
this->mPrevPos = auStack_e0.mUnk_14;
this->mPos = auStack_e0.mUnk_14;
this->mPrevPos = auStack_e0.mUnk_14;
this->mOffsetPos = auStack_e0.mUnk_14;
}
break;
+4 -4
View File
@@ -1,4 +1,5 @@
#include "Player/EquipHammer.hpp"
#include "Actor/Navi/ActorNavi.hpp"
#include "DTCM/UnkStruct_027e0d38.hpp"
#include "DTCM/UnkStruct_027e0fd4.hpp"
#include "Item/ItemManager.hpp"
@@ -6,7 +7,6 @@
#include "Player/LinkStateItem.hpp"
#include "Player/PlayerControl.hpp"
#include "Player/PlayerLink.hpp"
#include "Actor/Navi/ActorNavi.hpp"
extern "C" void ApproachAngle_thunk(s16 *src, s16 dst, u32 param3);
@@ -39,7 +39,7 @@ ARM bool EquipHammer::IsUsable(unk32 param1) const {
return false;
}
pAVar3 = (ActorNavi*)gItemManager->GetFairy(FairyId_Courage);
pAVar3 = (ActorNavi *) gItemManager->GetFairy(FairyId_Courage);
if (pAVar3 == NULL || pAVar3->mUnk_3b8 != 0) {
return false;
@@ -193,7 +193,7 @@ ARM void LinkStateItem::func_ov059_021990a4() {
}
pEVar4 = GetEquipHammer();
pAVar5 = (ActorNavi*)gItemManager->GetFairy(FairyId_Courage);
pAVar5 = (ActorNavi *) gItemManager->GetFairy(FairyId_Courage);
if (CHECK_0219b160(data_ov059_0219b160.mUnk_20)) {
this->mUnk_38 = gPlayerControl->mAimWorld;
@@ -243,5 +243,5 @@ ARM EquipHammer *GetEquipHammer() {
}
ARM void LinkStateItem::StopUsingHammer() {
((ActorNavi*)gItemManager->GetFairy(FairyId_Courage))->func_ov000_020b853c();
((ActorNavi *) gItemManager->GetFairy(FairyId_Courage))->func_ov000_020b853c();
}