mirror of
https://github.com/zeldaret/st
synced 2026-08-04 09:09:03 -04:00
Decompiling MLCK actor (#99)
* feat: begin decompiling mlck actor * feat: improvements * feat: save changes as a commit not as a stash eheh * feat: improvements * feat: better match for constructor * style: remove dead code * refactor: switch to fields to bool and use != 0 for unk32
This commit is contained in:
Alessevan
@@ -889,7 +889,7 @@ bool AdventureModeManager::func_ov024_020c6ce4() {
|
||||
return false;
|
||||
}
|
||||
|
||||
unk32 AdventureModeManager::func_ov024_020c6d04() {
|
||||
AdventureModeManager_194_0C *AdventureModeManager::func_ov024_020c6d04() {
|
||||
return this->mUnk_194->mUnk_0C;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,17 @@
|
||||
//! TODO: This file was generated automatically and might contain errors
|
||||
|
||||
#include "Actor/ActorUnkMLCK.hpp"
|
||||
|
||||
#include "Actor/ActorManager.hpp"
|
||||
#include "MainGame/AdventureMode.hpp"
|
||||
#include "System/SysNew.hpp"
|
||||
#include "Unknown/UnkStruct_0204a088.hpp"
|
||||
#include "Unknown/UnkStruct_027e09b8.hpp"
|
||||
#include "Unknown/UnkStruct_027e0ce0.hpp"
|
||||
#include "Unknown/UnkStruct_027e0d34.hpp"
|
||||
#include "Unknown/UnkStruct_ov000_020b51b8.hpp"
|
||||
#include "Unknown/UnkStruct_ov000_020b52e8.hpp"
|
||||
|
||||
extern "C" unk32 data_ov031_02110bec[];
|
||||
extern "C" unk32 data_ov031_02112ad4;
|
||||
|
||||
DECL_PROFILE(ActorProfileUnkMLCK);
|
||||
|
||||
@@ -12,26 +22,246 @@ Actor *ActorProfileUnkMLCK::Create() {
|
||||
ActorProfileUnkMLCK::ActorProfileUnkMLCK() :
|
||||
ActorProfile(ActorId_MLCK) {}
|
||||
|
||||
ActorUnkMLCK::ActorUnkMLCK() {}
|
||||
// non-matching
|
||||
ActorUnkMLCK::ActorUnkMLCK() :
|
||||
mUnk_B4(mUnk_A0),
|
||||
mUnk_BC(0x4),
|
||||
mUnk_C0(0x0),
|
||||
mUnk_C2(0x0),
|
||||
mUnk_C4(NULL),
|
||||
mUnk_C8(0x0),
|
||||
mUnk_CC(-1),
|
||||
mUnk_D0(0x0),
|
||||
mUnk_D2(0x0),
|
||||
mUnk_D4(0x0),
|
||||
mUnk_D6(0x0),
|
||||
mUnk_D8(this),
|
||||
mUnk_E4(this),
|
||||
mUnk_F0(false),
|
||||
mUnk_F1(false),
|
||||
mUnk_F2(false),
|
||||
mUnk_F3(true),
|
||||
mUnk_F4(-1) {}
|
||||
|
||||
void ActorUnkMLCK::func_ov031_020fac64(void) {}
|
||||
void ActorUnkMLCK::func_ov031_020fad3c(void) {}
|
||||
void ActorUnkMLCK::func_ov031_020fad88(void) {}
|
||||
void ActorUnkMLCK::func_ov031_020fada8(void) {}
|
||||
void ActorUnkMLCK::func_ov031_020fadb4(void) {}
|
||||
void ActorUnkMLCK::func_ov031_020fae08(void) {}
|
||||
void ActorUnkMLCK::func_ov031_020fae20(void) {}
|
||||
void ActorUnkMLCK::func_ov031_020faeb0(void) {}
|
||||
void ActorUnkMLCK::func_ov031_020faeb4(void) {}
|
||||
void ActorUnkMLCK::func_ov031_020faf04(void) {}
|
||||
void ActorUnkMLCK::func_ov031_020faf24(void) {}
|
||||
void ActorUnkMLCK::func_ov031_020fb104(void) {}
|
||||
void ActorUnkMLCK::func_ov031_020fb11c(void) {}
|
||||
void ActorUnkMLCK::func_ov031_020fb184(void) {}
|
||||
void ActorUnkMLCK::func_ov031_020fb1b0(void) {}
|
||||
void ActorUnkMLCK::func_ov031_020fb1cc(void) {}
|
||||
void ActorUnkMLCK::func_ov031_020fb1e8(void) {}
|
||||
void ActorUnkMLCK::func_ov031_020fb204(void) {}
|
||||
bool ActorUnkMLCK::vfunc_18(unk32 param1) {
|
||||
this->mUnk_B8 = this->mUnk_5C.mParams[0];
|
||||
|
||||
struct {
|
||||
void *ptr;
|
||||
unk32 actorId;
|
||||
unk32 param;
|
||||
} local_9c;
|
||||
local_9c.actorId = ActorId_MLCK;
|
||||
local_9c.param = this->mUnk_5C.mParams[0];
|
||||
local_9c.ptr = &data_ov031_02112ad4;
|
||||
Actor **lppActor = gpActorManager->func_01fff350(&local_9c, gpActorManager->mActorTable);
|
||||
|
||||
if (gpActorManager->mUnk_08 != lppActor) {
|
||||
return false;
|
||||
}
|
||||
void *param = this;
|
||||
if (param != NULL) {
|
||||
param = &this->mUnk_94;
|
||||
}
|
||||
data_0204a088->func_ov000_020611dc(param, 0x9);
|
||||
bool var1 = true;
|
||||
if (!((u16) gpMiscAdvManager->mSongs & (1 << this->mUnk_B8))) {
|
||||
var1 = false;
|
||||
}
|
||||
bool var2;
|
||||
if (var1 == false) {
|
||||
var2 = false;
|
||||
} else {
|
||||
var2 = true;
|
||||
}
|
||||
|
||||
this->mUnk_B4 = this->mUnk_A0;
|
||||
this->mUnk_F2 = var2;
|
||||
this->vfunc_64(0x0);
|
||||
return true;
|
||||
}
|
||||
|
||||
void ActorUnkMLCK::vfunc_54(unk32 param1, unk32 param2) {
|
||||
if (param2 != 0) {
|
||||
return;
|
||||
}
|
||||
this->vfunc_64(0x1);
|
||||
}
|
||||
|
||||
void ActorUnkMLCK::vfunc_58() {
|
||||
this->mUnk_F0 = true;
|
||||
}
|
||||
|
||||
void ActorUnkMLCK::vfunc_5C() {
|
||||
if (!this->mUnk_F1 || !this->mUnk_F0) {
|
||||
return;
|
||||
}
|
||||
data_027e0d34->func_ov031_020d994c();
|
||||
data_ov000_020b51b8.func_ov000_0206d274(data_ov031_02110bec[this->mUnk_B8]);
|
||||
this->mUnk_F0 = false;
|
||||
}
|
||||
|
||||
void ActorUnkMLCK::vfunc_60() {
|
||||
this->vfunc_64(0x0);
|
||||
}
|
||||
|
||||
// non-matching
|
||||
void ActorUnkMLCK::vfunc_64(unk32 param1) {
|
||||
this->mUnk_BC = param1;
|
||||
this->mUnk_C2 = 0xFFFF;
|
||||
this->mUnk_C0 = 0x0;
|
||||
if (param1 != 0x1) {
|
||||
return;
|
||||
}
|
||||
|
||||
this->mUnk_F1 = false;
|
||||
this->mUnk_C4 = data_ov000_020b52e8.func_ov000_0206f980(this->mUnk_B8);
|
||||
this->mUnk_C4->func_ov031_020fb184();
|
||||
}
|
||||
|
||||
void ActorUnkMLCK::vfunc_68() {
|
||||
if (data_0204a088->mUnk_04 != -1 || data_0204a088->mUnk_08 != -1) {
|
||||
return;
|
||||
}
|
||||
if (this->mUnk_F2) {
|
||||
data_ov000_020b51b8.func_ov000_0206d274(0x83);
|
||||
GetAdventureModeManager()->func_ov024_020c6d04()->mUnk_C4 = 0x1;
|
||||
GetAdventureModeManager()->func_ov024_020c6d10();
|
||||
this->vfunc_64(0x2);
|
||||
return;
|
||||
}
|
||||
this->vfunc_6C();
|
||||
}
|
||||
|
||||
void ActorUnkMLCK::func_ov031_020faeb0() {}
|
||||
|
||||
void ActorUnkMLCK::vfunc_6C() {
|
||||
if (this->mUnk_5C.mUnk_1A[0] != 0x0) {
|
||||
this->func_ov000_02098a88(0x0, 0x1);
|
||||
}
|
||||
for (ActorUnkMLCK_B4 *ptr = this->mUnk_A0; ptr != this->mUnk_B4; ++ptr) {
|
||||
ptr->mUnk_00->vfunc_00();
|
||||
}
|
||||
}
|
||||
|
||||
void ActorUnkMLCK::vfunc_70() {
|
||||
if (this->mUnk_5C.mUnk_1A[0] == 0x0) {
|
||||
return;
|
||||
}
|
||||
this->func_ov000_02098a88(0x0, 0x0);
|
||||
}
|
||||
|
||||
// non-matching
|
||||
void ActorUnkMLCK::func_ov031_020faf24() {
|
||||
UnkStackStruct1 stack;
|
||||
if (this->mUnk_C0 != 0xF) {
|
||||
return;
|
||||
}
|
||||
if (!this->mUnk_F2) {
|
||||
return;
|
||||
}
|
||||
bool var1 = this->func_ov031_020fb204(this->mUnk_B8);
|
||||
bool var9 = true;
|
||||
bool var = data_0204a088->func_ov000_020611fc(0x1);
|
||||
|
||||
GetAdventureModeManager()->func_ov024_020c6d10();
|
||||
|
||||
func_ov000_02072fd0(&stack);
|
||||
|
||||
stack.mUnk_00 = 0x1;
|
||||
stack.mUnk_3A = 0x0;
|
||||
stack.mUnk_3B = 0x0;
|
||||
|
||||
VecFx32_Copy(data_027e0ce0->func_01fff148(0x0), &stack.mUnk_0C);
|
||||
|
||||
this->mUnk_F4 = data_027e09b8->func_ov000_02073388(&stack, 0x0);
|
||||
|
||||
this->mUnk_D8.mUnk_04 = true;
|
||||
this->mUnk_D8.mUnk_05 = var1;
|
||||
ActorUnk_vfunc_B0 actor = ActorUnk_vfunc_B0();
|
||||
actor.mUnk_0C = (u16) (this->mUnk_B8 + 0x28) | 0x10000;
|
||||
actor.mUnk_00 = 0x1;
|
||||
actor.mUnk_14 = 0x0;
|
||||
actor.mUnk_32 = 0x0;
|
||||
|
||||
VecFx32_Copy(data_027e0ce0->func_01fff148(0x0), &actor.mUnk_34);
|
||||
actor.mUnk_04 = (unk32) & this->mUnk_D8;
|
||||
|
||||
data_027e09b8->func_ov000_02073470(&actor, 0x0);
|
||||
|
||||
if (!var) {
|
||||
if (var) {
|
||||
var9 = false;
|
||||
}
|
||||
this->mUnk_E4.mUnk_04 = false;
|
||||
this->mUnk_E4.mUnk_05 = var9;
|
||||
ActorUnk_vfunc_B0 actor2 = ActorUnk_vfunc_B0();
|
||||
actor2.mUnk_00 = 0x1;
|
||||
actor2.mUnk_0C = (u16) (this->mUnk_B8 + 0x88) | 0x10000;
|
||||
actor2.mUnk_14 = 0x0;
|
||||
actor2.mUnk_32 = 0x0;
|
||||
|
||||
VecFx32_Copy(data_027e0ce0->func_01fff148(0x0), &actor2.mUnk_34);
|
||||
actor2.mUnk_04 = (unk32) & this->mUnk_E4;
|
||||
|
||||
data_027e09b8->func_ov000_02073470(&actor2, 0x0);
|
||||
}
|
||||
|
||||
this->mUnk_F0 = false;
|
||||
this->mUnk_F1 = true;
|
||||
}
|
||||
|
||||
void ActorUnkMLCK::func_ov031_020fb104() {
|
||||
this->vfunc_64(0x3);
|
||||
}
|
||||
|
||||
void ActorUnkMLCK::func_ov031_020fb11c() {
|
||||
this->vfunc_6C();
|
||||
data_027e0d34->func_ov031_020d996c();
|
||||
this->vfunc_64(0x0);
|
||||
for (ActorUnkMLCK_B4 *ptr = this->mUnk_A0; ptr != this->mUnk_B4; ++ptr) {
|
||||
ptr->mUnk_00->vfunc_08();
|
||||
}
|
||||
}
|
||||
|
||||
void ActorUnkMLCK_B4_00::func_ov031_020fb184() {
|
||||
this->mUnk_04 = 0x0;
|
||||
this->mUnk_08 = -1;
|
||||
this->mUnk_0E = 0xFFFF;
|
||||
this->mUnk_0C = 0x0;
|
||||
this->mUnk_12 = 0xFFFF;
|
||||
this->mUnk_10 = 0x0;
|
||||
}
|
||||
|
||||
void ActorUnkMLCK_D8::vfunc2_00() {
|
||||
if (!this->mUnk_04) {
|
||||
return;
|
||||
}
|
||||
this->mUnk_08->func_ov031_020fb104();
|
||||
}
|
||||
|
||||
void ActorUnkMLCK_D8::vfunc2_04() {
|
||||
if (!this->mUnk_05) {
|
||||
return;
|
||||
}
|
||||
this->mUnk_08->func_ov031_020fb11c();
|
||||
}
|
||||
|
||||
void ActorUnkMLCK::func_ov031_020fb1e8(ActorUnkMLCK_B4_00 *param1) {
|
||||
if (this->mUnk_B4 != NULL) {
|
||||
this->mUnk_B4->mUnk_00 = param1;
|
||||
}
|
||||
++this->mUnk_B4;
|
||||
}
|
||||
|
||||
bool ActorUnkMLCK::func_ov031_020fb204(unk32 param1) {
|
||||
for (ActorUnkMLCK_B4 *ptr = this->mUnk_A0; ptr != this->mUnk_B4; ++ptr) {
|
||||
if (ptr->mUnk_00->vfunc_04()) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
ActorUnkMLCK::~ActorUnkMLCK() {}
|
||||
ActorProfileUnkMLCK::~ActorProfileUnkMLCK() {}
|
||||
|
||||
Reference in New Issue
Block a user