summaryrefslogtreecommitdiff
path: root/src/00_Core
diff options
context:
space:
mode:
authorAetias <144526980+AetiasHax@users.noreply.github.com>2026-05-11 20:34:17 +0200
committerGitHub <noreply@github.com>2026-05-11 20:34:17 +0200
commite704ec994219540b71da323a61ffa930f80ce492 (patch)
tree8ef52838d148fcc7c1d1f1cb2458f47af9c23fa0 /src/00_Core
parentd02c870d1dbe8c9b5e8b3acbb3b5bfff53ad8d03 (diff)
ActorCharacter OK (#162)
* ActorCharacter 93% * ActorCharacter 98% * ActorCharacter OK * Fix broken matches
Diffstat (limited to 'src/00_Core')
-rw-r--r--src/00_Core/Actor/Actor.cpp8
-rw-r--r--src/00_Core/Actor/Navi/ActorNaviBase.cpp7
-rw-r--r--src/00_Core/Save/AdventureFlags.cpp6
3 files changed, 11 insertions, 10 deletions
diff --git a/src/00_Core/Actor/Actor.cpp b/src/00_Core/Actor/Actor.cpp
index 19dbe4f3..9e5b4202 100644
--- a/src/00_Core/Actor/Actor.cpp
+++ b/src/00_Core/Actor/Actor.cpp
@@ -239,8 +239,8 @@ ARM bool Actor::vfunc_70() {
return true;
}
-ARM void Actor::vfunc_74() {}
-ARM void Actor::vfunc_7c() {}
+ARM void Actor::vfunc_74(ActorRef *ref) {}
+ARM void Actor::vfunc_7c(ActorRef *ref) {}
ARM bool Actor::vfunc_78() {
return true;
@@ -254,11 +254,11 @@ ARM bool Actor::vfunc_8c() {
return true;
}
-ARM bool Actor::vfunc_90() {
+ARM bool Actor::vfunc_90(unk32 param1, unk32 param2) {
return true;
}
-ARM void Actor::vfunc_94() {}
+ARM void Actor::vfunc_94(unk32 param1, unk32 param2) {}
ARM bool Actor::vfunc_98() {}
ARM bool Actor::vfunc_9c() {}
diff --git a/src/00_Core/Actor/Navi/ActorNaviBase.cpp b/src/00_Core/Actor/Navi/ActorNaviBase.cpp
index 0bbe0f8a..3e907fd4 100644
--- a/src/00_Core/Actor/Navi/ActorNaviBase.cpp
+++ b/src/00_Core/Actor/Navi/ActorNaviBase.cpp
@@ -1,4 +1,5 @@
#include "Actor/Navi/ActorNaviBase.hpp"
+#include "Actor/ActorRef.hpp"
u16 ActorNaviBase::vfunc_c4() {}
u16 ActorNaviBase::vfunc_c8() {}
@@ -36,11 +37,11 @@ void ActorNaviBase::vfunc_80() {}
void ActorNaviBase::vfunc_84() {}
bool ActorNaviBase::vfunc_78() {}
bool ActorNaviBase::vfunc_bc(unk32 param1, unk8 param2, s32 param3) {}
-void ActorNaviBase::vfunc_74() {}
+void ActorNaviBase::vfunc_74(ActorRef *ref) {}
void ActorNaviBase::func_ov000_020baca8(Vec3p *param1, unk32 param2) {}
void ActorNaviBase::func_ov000_020bad18() {}
-bool ActorNaviBase::vfunc_90() {}
-void ActorNaviBase::vfunc_94() {}
+bool ActorNaviBase::vfunc_90(unk32 param1, unk32 param2) {}
+void ActorNaviBase::vfunc_94(unk32 param1, unk32 param2) {}
void ActorNaviBase::func_ov000_020bb0ac() {}
void ActorNaviBase::func_ov000_020bb0e0() {}
void ActorNaviBase::vfunc_ec() {}
diff --git a/src/00_Core/Save/AdventureFlags.cpp b/src/00_Core/Save/AdventureFlags.cpp
index 7851fd62..59ed44c3 100644
--- a/src/00_Core/Save/AdventureFlags.cpp
+++ b/src/00_Core/Save/AdventureFlags.cpp
@@ -75,7 +75,7 @@ ARM void AdventureFlags::Set(AdventureFlag flag, bool value) {
}
}
-ARM void AdventureFlags::func_ov00_02097810(s32 param1, astruct_23 *param2) {}
+ARM unk32 AdventureFlags::func_ov00_02097810(UnkStruct_ov000_0209a50c *param2) {}
// non-matching
ARM unk32 AdventureFlags::func_ov00_02097968(unk32 param1) {
@@ -83,7 +83,7 @@ ARM unk32 AdventureFlags::func_ov00_02097968(unk32 param1) {
return -1;
}
- astruct_23 aStack_c0;
+ UnkStruct_ov000_0209a50c aStack_c0;
aStack_c0.mUnk_16 = data_027e0db0.mUnk_04 > 0;
FlagsUnk2 FStack_d8;
@@ -120,7 +120,7 @@ ARM bool AdventureFlags::func_ov00_02097bcc(s32 param1) {
return this->mUnk_44->func_ov000_02098fa4(param1);
}
-ARM bool AdventureFlags::func_ov00_02097bcc(astruct_23 *param1) {
+ARM bool AdventureFlags::func_ov00_02097bcc(UnkStruct_ov000_0209a50c *param1) {
if (this->func_ov00_02097738()) {
return this->mUnk_44->func_ov000_020990a4(param1);
}