summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAetias <144526980+AetiasHax@users.noreply.github.com>2026-05-09 12:36:22 +0200
committerGitHub <noreply@github.com>2026-05-09 12:36:22 +0200
commite9ffe114a97fd3bf563a8c346f2ef2dc5e88f9fd (patch)
tree71b1e9895021bcf152c965a87baf1a9d7c7dd699 /src
parentb44496319d3027a625fcf876cf22e467720355df (diff)
Delink character actor base classes and shop keeper actors (#152)
* Delink .text for ActorItemSeller, ActorBeedle, ActorTetra * Delink .text for ActorCharacterBase, ActorCharacter, ActorGenericCharacter * Define classes ActorCharacterBase, ActorCharacter, ActorGenericCharacter * Don't define `override` macro during intellisense/clangd * Define symbols for ActorCharacter, ActorCharacterBase, ActorGenericCharacter * Define classes and symbols for ActorItemSeller, ActorBeedle, ActorTetra * Fix duplicate symbol
Diffstat (limited to 'src')
-rw-r--r--src/14_Land/Actor/Character/ActorCharacter.cpp49
-rw-r--r--src/14_Land/Actor/Character/ActorCharacterBase.cpp32
-rw-r--r--src/14_Land/Actor/Character/ActorGenericCharacter.cpp46
-rw-r--r--src/31_Shop/Actor/ActorBeedle.cpp31
-rw-r--r--src/31_Shop/Actor/ActorItemSeller.cpp21
-rw-r--r--src/31_Shop/Actor/ActorItemSellerBase.cpp39
-rw-r--r--src/31_Shop/Actor/ActorTetra.cpp12
7 files changed, 230 insertions, 0 deletions
diff --git a/src/14_Land/Actor/Character/ActorCharacter.cpp b/src/14_Land/Actor/Character/ActorCharacter.cpp
new file mode 100644
index 00000000..b3d2b273
--- /dev/null
+++ b/src/14_Land/Actor/Character/ActorCharacter.cpp
@@ -0,0 +1,49 @@
+#include "Actor/Character/ActorCharacter.hpp"
+#include "Unknown/UnkStruct_ov000_020c0c08.hpp"
+
+void ActorCharacter::func_ov014_02144d94() {}
+void ActorCharacter::func_ov014_02144dec() {}
+void ActorCharacter::func_ov014_02144e14() {}
+void ActorCharacter::func_ov014_02144e28() {}
+void ActorCharacter::func_ov014_02144e3c() {}
+void ActorCharacter::func_ov014_02144e58() {}
+void ActorCharacter::func_ov014_02144e74() {}
+
+ActorCharacter_288::ActorCharacter_288() :
+ UnkStruct_ov000_020c0c08(mUnk_24, NULL) {}
+ActorCharacter::ActorCharacter() {}
+
+ActorCharacter::~ActorCharacter() {}
+bool ActorCharacter::Init() {}
+void ActorCharacter::vfunc_20(bool param1) {}
+
+void ActorCharacter::func_ov014_02145178() {}
+void ActorCharacter::func_ov014_021451f0(unk32 *param1) {}
+void ActorCharacter::func_ov014_02145258() {}
+unk32 ActorCharacter::func_ov014_021452b0() {}
+unk32 ActorCharacter::func_ov014_02145318() {}
+void ActorCharacter::func_ov014_021453f4() {}
+void ActorCharacter::func_ov014_02145414() {}
+void ActorCharacter::func_ov014_0214548c() {}
+void ActorCharacter::func_ov014_02145508() {}
+static void func_ov014_02145520(ActorCharacter *actor) {}
+void ActorCharacter::func_ov014_0214552c() {}
+
+void ActorCharacter::vfunc_80() {}
+void ActorCharacter::vfunc_84() {}
+void ActorCharacter::vfunc_cc() {}
+void ActorCharacter::vfunc_c8() {}
+bool ActorCharacter::vfunc_78() {}
+void ActorCharacter::vfunc_74() {}
+void ActorCharacter::vfunc_7c() {}
+bool ActorCharacter::vfunc_90() {}
+void ActorCharacter::vfunc_94() {}
+bool ActorCharacter::vfunc_98() {}
+void ActorCharacter::vfunc_d0() {}
+bool ActorCharacter::vfunc_9c() {}
+void ActorCharacter::vfunc_ec(unk32 param1) {}
+void ActorCharacter::vfunc_f0(unk32 param1) {}
+
+void ActorCharacter::func_ov014_0214591c() {}
+
+bool ActorCharacter::IsHitboxTouched(bool param1) {} \ No newline at end of file
diff --git a/src/14_Land/Actor/Character/ActorCharacterBase.cpp b/src/14_Land/Actor/Character/ActorCharacterBase.cpp
new file mode 100644
index 00000000..db2ed1ee
--- /dev/null
+++ b/src/14_Land/Actor/Character/ActorCharacterBase.cpp
@@ -0,0 +1,32 @@
+#include "Actor/Character/ActorCharacter.hpp"
+
+static void func_ov014_021447f8(ActorCharacterBase *actor) {}
+static void func_ov014_0214480c(ActorCharacterBase *actor) {}
+static void func_ov014_02144820(ActorCharacterBase *actor) {}
+static void func_ov014_02144834(ActorCharacterBase *actor) {}
+static void func_ov014_02144848(unk32 *param1, unk32 param2, ActorCharacterBase *actor) {}
+
+unk32 ActorCharacterBase::vfunc_d8() {}
+unk32 ActorCharacterBase::vfunc_dc() {}
+unk32 ActorCharacterBase::vfunc_e0() {}
+unk32 ActorCharacterBase::vfunc_e4() {}
+void ActorCharacterBase::vfunc_e8() {}
+
+ActorCharacterBase::ActorCharacterBase() :
+ mUnk_158(0x1000000) {}
+ActorCharacterBase::~ActorCharacterBase() {}
+
+bool ActorCharacterBase::Init() {}
+void ActorCharacterBase::vfunc_14(u32 param1) {}
+bool ActorCharacterBase::vfunc_c0() {}
+void ActorCharacterBase::vfunc_18(u32 param1) {}
+unk32 ActorCharacterBase::vfunc_d4() {}
+void ActorCharacterBase::vfunc_b4() {}
+void ActorCharacterBase::vfunc_b8() {}
+void ActorCharacterBase::vfunc_80() {}
+void ActorCharacterBase::vfunc_84() {}
+void ActorCharacterBase::vfunc_cc() {}
+void ActorCharacterBase::vfunc_c8() {}
+void ActorCharacterBase::vfunc_d0() {}
+void ActorCharacterBase::vfunc_68() {}
+bool ActorCharacterBase::vfunc_bc() {}
diff --git a/src/14_Land/Actor/Character/ActorGenericCharacter.cpp b/src/14_Land/Actor/Character/ActorGenericCharacter.cpp
new file mode 100644
index 00000000..a378ed48
--- /dev/null
+++ b/src/14_Land/Actor/Character/ActorGenericCharacter.cpp
@@ -0,0 +1,46 @@
+#include "Actor/Character/ActorCharacter.hpp"
+
+#define static
+
+ActorGenericCharacter::ActorGenericCharacter() {}
+bool ActorGenericCharacter::Init() {}
+void ActorGenericCharacter::vfunc_68() {}
+bool ActorGenericCharacter::vfunc_c0() {}
+void ActorGenericCharacter::vfunc_c4() {}
+void ActorGenericCharacter::func_ov014_02147940() {}
+void ActorGenericCharacter::func_ov014_02147950() {}
+void ActorGenericCharacter::vfunc_80() {}
+void ActorGenericCharacter::vfunc_84() {}
+
+void ActorGenericCharacter::func_ov014_02147ae8() {}
+bool ActorGenericCharacter::func_ov014_02147b18() {}
+void ActorGenericCharacter::func_ov014_02147ba0() {}
+bool ActorGenericCharacter::func_ov014_02147bb0() {}
+unk32 ActorGenericCharacter::func_ov014_02147bd8() {}
+void ActorGenericCharacter::func_ov014_02147c00() {}
+
+ActorGenericCharacter::~ActorGenericCharacter() {}
+void ActorGenericCharacter::vfunc_f8() {}
+
+void ActorGenericCharacter::func_ov014_02147c98() {}
+void ActorGenericCharacter::func_ov014_02147ce8(unk32 param1) {}
+void ActorGenericCharacter::func_ov014_02147d44(unk32 param1) {}
+static void func_ov014_02147df0(ActorGenericCharacter *actor) {}
+
+void ActorGenericCharacter::func_ov014_02147dfc() {}
+void ActorGenericCharacter::func_ov014_02147e1c() {}
+void ActorGenericCharacter::func_ov014_02147e64() {}
+void ActorGenericCharacter::func_ov014_02147ebc() {}
+static void func_ov014_02147ed8(ActorGenericCharacter *actor) {}
+
+void ActorGenericCharacter::func_ov014_02147ee4() {}
+void ActorGenericCharacter::func_ov014_02147fbc() {}
+void ActorGenericCharacter::func_ov014_02147fcc() {}
+void ActorGenericCharacter::func_ov014_021480dc() {}
+void ActorGenericCharacter::func_ov014_02148130() {}
+void ActorGenericCharacter::func_ov014_0214813c() {}
+void ActorGenericCharacter::func_ov014_02148168() {}
+void ActorGenericCharacter::func_ov014_02148198() {}
+void ActorGenericCharacter::func_ov014_021481cc() {}
+void ActorGenericCharacter::func_ov014_021481fc() {}
+static void func_ov014_02148228(ActorGenericCharacter *actor) {} \ No newline at end of file
diff --git a/src/31_Shop/Actor/ActorBeedle.cpp b/src/31_Shop/Actor/ActorBeedle.cpp
new file mode 100644
index 00000000..0daf9d03
--- /dev/null
+++ b/src/31_Shop/Actor/ActorBeedle.cpp
@@ -0,0 +1,31 @@
+#include "Actor/Character/ActorItemSeller.hpp"
+
+ActorBeedle *ActorBeedle::Create() {}
+
+bool ActorBeedle::Init() {}
+void ActorBeedle::vfunc_c4() {}
+void ActorBeedle::vfunc_114() {}
+unk32 ActorBeedle::vfunc_d4() {}
+
+static unk32 func_ov031_02180e44(unk32 param1, unk32 param2) {}
+
+void ActorBeedle::vfunc_f4() {}
+void ActorBeedle::vfunc_f8() {}
+void ActorBeedle::vfunc_fc() {}
+void ActorBeedle::vfunc_100() {}
+void ActorBeedle::vfunc_104() {}
+unk32 ActorBeedle::vfunc_d8() {}
+unk32 ActorBeedle::vfunc_dc() {}
+unk32 ActorBeedle::vfunc_e0() {}
+bool ActorBeedle::vfunc_70() {}
+bool ActorBeedle::vfunc_6c() {}
+void ActorBeedle::vfunc_108() {}
+void ActorBeedle::vfunc_10c() {}
+void ActorBeedle::vfunc_110() {}
+
+unk32 ActorBeedle::func_ov031_021812e4(unk32 param1) {}
+void ActorBeedle::func_ov031_0218132c(unk32 param1) {}
+
+void ActorBeedle::vfunc_11c() {}
+void ActorBeedle::vfunc_118() {}
+ActorBeedle::~ActorBeedle() {}
diff --git a/src/31_Shop/Actor/ActorItemSeller.cpp b/src/31_Shop/Actor/ActorItemSeller.cpp
new file mode 100644
index 00000000..c6d746af
--- /dev/null
+++ b/src/31_Shop/Actor/ActorItemSeller.cpp
@@ -0,0 +1,21 @@
+#include "Actor/Character/ActorItemSeller.hpp"
+
+ActorItemSeller *ActorItemSeller1::Create() {}
+ActorItemSeller *ActorItemSeller2::Create() {}
+ActorItemSeller *ActorItemSeller3::Create() {}
+
+bool ActorItemSeller::Init() {}
+void ActorItemSeller::vfunc_114() {}
+void ActorItemSeller::vfunc_f4() {}
+void ActorItemSeller::vfunc_f8() {}
+void ActorItemSeller::vfunc_fc() {}
+void ActorItemSeller::vfunc_100() {}
+void ActorItemSeller::vfunc_104() {}
+void ActorItemSeller::vfunc_118() {}
+
+unk32 ActorItemSeller::vfunc_d4() {}
+
+void ActorItemSeller::vfunc_108() {}
+void ActorItemSeller::vfunc_10c() {}
+void ActorItemSeller::vfunc_110() {}
+ActorItemSeller::~ActorItemSeller() {}
diff --git a/src/31_Shop/Actor/ActorItemSellerBase.cpp b/src/31_Shop/Actor/ActorItemSellerBase.cpp
new file mode 100644
index 00000000..d051a075
--- /dev/null
+++ b/src/31_Shop/Actor/ActorItemSellerBase.cpp
@@ -0,0 +1,39 @@
+#include "Actor/Character/ActorItemSeller.hpp"
+
+ActorItemSellerBase::ActorItemSellerBase() {}
+ActorItemSellerBase::~ActorItemSellerBase() {}
+
+bool ActorItemSellerBase::Init() {}
+void ActorItemSellerBase::vfunc_20(bool param1) {}
+bool ActorItemSellerBase::vfunc_c0() {}
+void ActorItemSellerBase::vfunc_c4() {}
+
+void ActorItemSellerBase::func_ov031_0217d588() {}
+void ActorItemSellerBase::func_ov031_0217d5c0() {}
+void ActorItemSellerBase::func_ov031_0217d5c4() {}
+void ActorItemSellerBase::func_ov031_0217d5e8() {}
+void ActorItemSellerBase::func_ov031_0217d610() {}
+void ActorItemSellerBase::func_ov031_0217d62c() {}
+void ActorItemSellerBase::func_ov031_0217d638() {}
+void ActorItemSellerBase::func_ov031_0217d6ac() {}
+void ActorItemSellerBase::func_ov031_0217d6d0() {}
+void ActorItemSellerBase::func_ov031_0217d760() {}
+void ActorItemSellerBase::func_ov031_0217d784() {}
+void ActorItemSellerBase::func_ov031_0217d7ac() {}
+void ActorItemSellerBase::func_ov031_0217d830() {}
+void ActorItemSellerBase::func_ov031_0217d858() {}
+void ActorItemSellerBase::func_ov031_0217d890() {}
+void ActorItemSellerBase::func_ov031_0217d8d0() {}
+void ActorItemSellerBase::func_ov031_0217d8dc() {}
+void ActorItemSellerBase::func_ov031_0217d93c() {}
+void ActorItemSellerBase::func_ov031_0217d974() {}
+
+unk32 ActorItemSellerBase::vfunc_d4() {}
+bool ActorItemSellerBase::vfunc_8c() {}
+
+void ActorItemSellerBase::func_ov031_0217da20(unk32 param1) {}
+
+void ActorItemSellerBase::vfunc_68() {}
+bool ActorItemSellerBase::CollidesWithLink() {}
+void ActorItemSellerBase::vfunc_11c() {}
+bool ActorItemSellerBase::IsHitboxTouched(bool param1) {}
diff --git a/src/31_Shop/Actor/ActorTetra.cpp b/src/31_Shop/Actor/ActorTetra.cpp
new file mode 100644
index 00000000..b7566b1d
--- /dev/null
+++ b/src/31_Shop/Actor/ActorTetra.cpp
@@ -0,0 +1,12 @@
+#include "Actor/Character/ActorTetra.hpp"
+
+ActorTetra *ActorTetra::Create() {}
+void ActorTetra::vfunc_f4() {}
+void ActorTetra::vfunc_c4() {}
+void ActorTetra::vfunc_20(bool param1) {}
+
+void ActorTetra_4b0::func_ov031_02181610(unk32 param1, unk32 param2, unk32 param3, unk32 param4, u16 param5) {}
+void ActorTetra_4b0::func_ov031_02181798() {}
+
+ActorTetra::~ActorTetra() {}
+void ActorTetra::vfunc_f8() {}