Decomp ActorForceNavi and ActorWisdomNavi 100%

This commit is contained in:
Aetias
2025-03-08 11:46:49 +01:00
parent 35d8fa6f10
commit 44ba14e823
13 changed files with 60 additions and 46 deletions
+10 -3
View File
@@ -1,7 +1,14 @@
#include "Actor/Navi/ActorForceNavi.hpp"
#pragma section sbss begin
ActorType ActorForceNavi::gType = ActorType(ActorTypeId_ForceNavi, (ActorCreateFunc) ActorForceNavi::Create, NULL);
#pragma section sbss end
ActorForceNavi *ActorForceNavi::Create() {}
void ActorForceNavi::vfunc_b4() {}
ActorForceNavi::~ActorForceNavi() {}
extern u32 **data_027e0fe0[];
ActorForceNavi *ActorForceNavi::Create() {
return new(*data_027e0fe0[0], 4) ActorForceNavi();
}
ARM FairyId ActorForceNavi::GetFairyId() {
return FairyId_Power;
}
+1 -1
View File
@@ -14,7 +14,7 @@ void UnkStruct_ov000_020b8110::vfunc_14(u16 *param1) {}
void ActorNavi::func_ov000_020b8200() {}
void ActorNavi::vfunc_c4() {}
void ActorNavi::vfunc_c8() {}
void ActorNavi::vfunc_b4() {}
FairyId ActorNavi::GetFairyId() {}
s32 ActorNavi::vfunc_b8() {}
void ActorNavi::vfunc_d4() {}
void ActorNavi::vfunc_d0() {}
+10 -3
View File
@@ -1,7 +1,14 @@
#include "Actor/Navi/ActorWisdomNavi.hpp"
#pragma section sbss begin
ActorType ActorWisdomNavi::gType = ActorType(ActorTypeId_WisdomNavi, (ActorCreateFunc) ActorWisdomNavi::Create, NULL);
#pragma section sbss end
ActorWisdomNavi *ActorWisdomNavi::Create() {}
void ActorWisdomNavi::vfunc_b4() {}
ActorWisdomNavi::~ActorWisdomNavi() {}
extern u32 **data_027e0fe0[];
ARM ActorWisdomNavi *ActorWisdomNavi::Create() {
return new(*data_027e0fe0[0], 4) ActorWisdomNavi();
}
ARM FairyId ActorWisdomNavi::GetFairyId() {
return FairyId_Wisdom;
}
+1 -1
View File
@@ -126,7 +126,7 @@ ARM FairyId ItemManager::GetEquippedFairy() const {
return fairy;
}
ARM ActorNavi *ItemManager::GetFairy(FairyId id) const {
ARM ActorNaviBase *ItemManager::GetFairy(FairyId id) const {
return mFairies[id];
}