mirror/st
1
0
Fork 0
mirror of https://github.com/zeldaret/st synced 2026-07-07 05:55:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decompile overlay 1 (Part 5) (#100)

Browse Source 
* start PlayerActorBase_70_001

* PlayerActorBase_70_001 OK

* PlayerActor -> PlayerLinkActor

* Player_001 35%

* fix regressions

* organise files better

* PlayerLinkActor_001 40%

* PlayerLinkActor_001 OK

* tiny self-review
This commit is contained in:
Yanis
2026-07-05 13:44:41 +02:00
committed by GitHub
parent 9987fee73a
commit bf559e183d
42 changed files with 1224 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Actor/Actor.hpp
+16
View File
@@ -91,10 +91,26 @@ enum ActorFlag_ {
class Actor_C4;
struct ActorGrabParams;
extern "C" void func_ov000_0205d500(ActorGrabParams *, unk32, unk32);
bool PlayerCharacter_IsNotLink(s32 character);
struct ActorGrabParams {
/* 00 */ u16 unk_00;
/* 02 */ u16 unk_02;
/* 04 */
ActorGrabParams() {}
ActorGrabParams(unk32 param2, unk32 param3) {
ActorGrabParams local_1c;
func_ov000_0205d500(&local_1c, param3, param2);
*this = local_1c;
}
void operator=(ActorGrabParams &from) {
*(u32 *) this = *(u32 *) &from;
}
};
class Actor_9C {
include/Player/Player.hpp
-207
View File
@@ -1,207 +0,0 @@
#pragma once
#include "Actor/Actor.hpp"
#include "LinkList.hpp"
#include "Unknown/Common.hpp"
#include "Unknown/UnkStruct_ov000_0208f820.hpp"
#include "math.hpp"
#include "types.h"
class UnkStruct_027e0ce0_40;
class PlayerActorBase_5C {
public:
/* 00 */ unk32 mUnk_00;
/* 04 */ unk32 mUnk_04;
/* 08 */ unk32 mUnk_08;
/* 0C */ unk32 mUnk_0C;
/* 10 */ void *mUnk_10;
/* 14 */
};
class PlayerActorBase_70 {
public:
/* 000 */ STRUCT_PAD(0x00, 0x160);
/* 160 */
PlayerActorBase_70();
};
class PlayerActorBase_74 {
public:
/* 00 */ STRUCT_PAD(0x00, 0x34);
/* 34 */
PlayerActorBase_74();
};
class PlayerActorBase {
public:
/* 00 */ VecFx32 mPos;
/* 0C */ VecFx32 mPrevPos;
/* 18 */ VecFx32 mVel;
/* 24 */ VecFx32 mAccel;
/* 30 */ u16 mAngle;
/* 32 */ u8 mInvincibilityTimer;
/* 33 */ u8 mInvincibilityIconTimer; // the blinking icon on top-screen
/* 34 */ ActorRef mGrabActor;
/* 38 */ UnkStruct_PlayerGet_64 mUnk_38;
/* 44 */ unk32 mUnk_44;
/* 48 */ unk32 mUnk_48;
/* 4C */ unk32 mUnk_4C;
/* 50 */ ActorGrabParams mUnk_50;
/* 54 */ unk32 mUnk_54;
/* 58 */ UnkStruct_027e0ce0_40 *mUnk_58;
/* 5C */ PlayerActorBase_5C mUnk_5C;
/* 70 */ PlayerActorBase_70 *mUnk_70;
/* 74 */ PlayerActorBase_74 *mUnk_74;
/* 78 */ STRUCT_PAD(0x78, 0x84);
/* 84 */ UnkStruct_ov019_020d24c8_28_258 mUnk_84;
/* 9C */
PlayerActorBase();
};
class PlayerActor_9C {
public:
/* 000 (vtable) */
/* 004 */ STRUCT_PAD(0x04, 0x154);
/* 154 */
PlayerActor_9C();
// data_ov000_020b2a8c
/* 00 */ virtual ~PlayerActor_9C();
};
class PlayerActor_A0_38;
class PlayerActor_A0_38_04_Base : public LinkList<PlayerActor_A0_38_04_Base> {
public:
/* 00 (vtable) */
/* 04 (base) */
/* 0C */ unk32 mUnk_0C;
/* 10 */ PlayerActor_A0_38 *mUnk_10;
/* 14 */
PlayerActor_A0_38_04_Base(PlayerActor_A0_38 *param1) {
this->mUnk_0C = 0;
this->mUnk_10 = param1;
}
/* 00 */ virtual void vfunc_00();
};
class PlayerActor_A0_38_04 : public PlayerActor_A0_38_04_Base {
public:
/* 00 (vtable) */
/* 04 (base) */
/* 0C */
PlayerActor_A0_38_04(PlayerActor_A0_38 *param1) :
PlayerActor_A0_38_04_Base(param1) {}
// data_ov024_020d8250
/* 00 */ virtual void vfunc_00() override;
};
class PlayerActor_A0_38_18 : public PlayerActor_A0_38_04_Base {
public:
/* 00 (vtable) */
/* 04 (base) */
/* 0C */
PlayerActor_A0_38_18(PlayerActor_A0_38 *param1) :
PlayerActor_A0_38_04_Base(param1) {}
// data_ov024_020d8244
/* 00 */ virtual void vfunc_00() override;
};
class PlayerActor_A0_38 {
public:
/* 00 */ unk16 mUnk_00;
/* 02 */ unk16 mUnk_02;
/* 04 */ PlayerActor_A0_38_04 mUnk_04;
/* 18 */ PlayerActor_A0_38_18 mUnk_18;
/* 2C */ Vec2s mUnk_2C;
/* 30 */ u16 mUnk_30;
/* 32 */ unk16 mUnk_32;
/* 34 */ u16 mUnk_34;
/* 36 */ bool mUnk_36;
/* 37 */ bool mUnk_37;
/* 38 */
PlayerActor_A0_38();
~PlayerActor_A0_38();
void func_ov024_020d19d8();
};
class PlayerActor_A0 {
public:
/* 00 */ STRUCT_PAD(0x00, 0x38);
/* 38 */ PlayerActor_A0_38 *mUnk_38;
/* 3C */ STRUCT_PAD(0x3C, 0x94);
/* 94 */
PlayerActor_A0();
};
class PlayerActor_A4 {
public:
/* 00 */ unk32 mUnk_00;
/* 04 */ unk32 mUnk_04;
/* 08 */ unk8 mUnk_08;
/* 09 */ unk8 mUnk_09;
/* 0A */ unk8 mUnk_0A;
/* 0B */ unk8 mUnk_0B;
/* 0C */
};
class PlayerActor_134 {
public:
/* 00 */ unk32 mUnk_00;
/* 04 */ unk32 mUnk_04;
/* 08 */
PlayerActor_134() {
this->mUnk_00 = 0;
this->mUnk_04 = 0;
}
};
class PlayerActor_1B0 : public UnkSystem7 {
public:
/* 00 (base) */
/* 04 */ unk32 mUnk_04;
/* 08 */ unk32 mUnk_08;
/* 0C */
PlayerActor_1B0();
~PlayerActor_1B0();
};
class PlayerActor : public PlayerActorBase {
public:
/* 000 (base) */
/* 09C */ PlayerActor_9C *mUnk_9C;
/* 0A0 */ PlayerActor_A0 *mUnk_A0;
/* 0A4 */ PlayerActor_A4 mUnk_A4;
/* 0B0 */ unk32 mUnk_B0;
/* 0B4 */ unk8 mUnk_B4;
/* 0B5 */ unk8 mUnk_B5;
/* 0B6 */ unk8 mUnk_B6;
/* 0B7 */ unk8 mUnk_B7;
/* 0B8 */ unk8 mUnk_B8;
/* 0B9 */ unk8 mUnk_B9;
/* 0BA */ unk8 mUnk_BA;
/* 0BB */ unk8 mUnk_BB;
/* 0BC */ CellAnimObject mUnk_BC;
/* 134 */ PlayerActor_134 *mUnk_134;
/* 138 */ CellAnimObject mUnk_138; // sanctuary link icon animation
/* 1B0 */ PlayerActor_1B0 mUnk_1B0[3];
/* 1D4 */
PlayerActor(); //! TODO: params
};
include/Player/PlayerActorBase.hpp
+426
View File
@@ -0,0 +1,426 @@
#pragma once
#include "Actor/Actor.hpp"
#include "LinkList.hpp"
#include "Render/ModelRender.hpp"
#include "Unknown/Common.hpp"
#include "Unknown/UnkStruct_027e09a4.hpp"
#include "Unknown/UnkStruct_ov000_0208f820.hpp"
#include "math.hpp"
#include "types.h"
#include <nns/g3d/g3d.h>
class UnkStruct_027e0ce0_40;
class PlayerActorBase_70;
typedef s32 PlayerCharacter;
enum PlayerCharacter_ {
/* 0 */ PlayerCharacter_Link = 0,
/* 1 */ PlayerCharacter_Phantom = 1,
/* 2 */ PlayerCharacter_Zelda = 2,
/* 3 */ PlayerCharacter_Max,
};
struct UnkStruct_ov000_020ab4dc {
/* 00 */ const char *mpDirectory;
/* 04 */ const char mUnk_04[16];
/* 14 */ const char mUnk_14[16];
/* 24 */ const char mUnk_24[16];
/* 34 */ const char mUnk_34[16];
/* 44 */ const char mUnk_44[16];
/* 54 */ STRUCT_PAD(0x54, 0x66);
/* 66 */ s16 mUnk_66;
/* 66 */ unk16 mUnk_68;
/* 66 */ unk16 mUnk_6A;
/* 66 */ unk16 mUnk_6C;
/* 66 */ unk16 mUnk_6E;
/* 66 */ unk16 mUnk_70;
/* 66 */ unk16 mUnk_72;
/* 74 */ s16 mUnk_74;
/* 78 */ STRUCT_PAD(0x78, 0x9C);
/* 9C */
};
extern const UnkStruct_ov000_020ab4dc data_ov000_020ab4dc[PlayerCharacter_Max];
extern "C" G3d_Model *func_ov000_0208eadc(PlayerCharacter, unk32, bool);
extern "C" G3d_Model *func_ov000_0208eb44(PlayerCharacter, unk32, bool);
inline bool PlayerCharacter_IsNotLink(PlayerCharacter character) {
bool ret = false;
if (character != PlayerCharacter_Link) {
ret = true;
}
return ret;
}
inline bool PlayerCharacter_IsNotLink2(PlayerCharacter character) {
bool ret = true;
if (character == PlayerCharacter_Link) {
ret = false;
}
return ret;
}
class ModelRender_Derived3 : public ModelRender {
public:
/* 00 (base) */
/* 60 */
ModelRender_Derived3(PlayerCharacter character, G3d_Model *pModel);
// data_ov000_020b2b44
/* 00 */ virtual ~ModelRender_Derived3() override {}
void func_ov000_0208c058(unk32 param1);
};
class ModelRender_Derived4 : public ModelRender_Derived3 {
public:
/* 00 (base) */
/* 60 */ STRUCT_PAD(0x60, 0x78);
/* 78 */ unk32 mUnk_78;
/* 7C */ unk32 mUnk_7C[9];
/* A0 */ unk32 mUnk_A0[7];
/* BC */ unk32 mUnk_BC;
/* C0 */
ModelRender_Derived4(PlayerCharacter character, unk32 param2, G3d_Model *pModel, G3d_BoneMtxStruct *pCacheJntAnm);
// data_ov000_020b2b70
/* 1C */ virtual void vfunc_1C(UnkSystem4_vfunc_1C *param1) override;
};
class ModelRender_Derived5 : public ModelRender_Derived3 {
public:
/* 00 (base) */
/* 60 */ STRUCT_PAD(0x60, 0xA8);
/* A8 */
ModelRender_Derived5(PlayerCharacter character, G3d_Model *pModel, G3d_BoneMtxStruct *pCacheJntAnm);
// data_ov093_021787e8
/* 00 */ virtual ~ModelRender_Derived5() override {}
/* 1C */ virtual void vfunc_1C(UnkSystem4_vfunc_1C *param1) override;
};
class PlayerActorBase_38 {
private:
/* 00 */ UnkStruct_PlayerGet_64 mUnk_00;
public:
PlayerActorBase_38(void *param1) :
mUnk_00(param1) {
this->mUnk_00.mUnk_08 = 0;
}
void Reset() {
this->mUnk_00.~UnkStruct_PlayerGet_64();
this->mUnk_00.mUnk_08 = 0;
}
};
class PlayerActorBase_5C {
public:
/* 00 */ unk32 mUnk_00;
/* 04 */ unk32 mUnk_04;
/* 08 */ unk32 mUnk_08;
/* 0C */ unk32 mUnk_0C;
/* 10 */ void *mUnk_10;
/* 14 */
void func_ov000_02089dc4();
};
class PlayerActorBase_70_0C {
private:
/* 00 */ G3d_Model *mpModel1;
/* 04 */ G3d_Model *mpModel2;
/* 08 */ ModelRender_Derived3 *mUnk_08;
/* 0C */ ModelRender_Derived3 *mUnk_0C;
/* 10 */
public:
// clang-format off
G3d_Model* GetModel1() const { return this->mpModel1; }
G3d_Model* GetModel2() const { return this->mpModel2; }
ModelRender_Derived3* GetUnk08() const { return this->mUnk_08; }
ModelRender_Derived3* GetUnk0C() const { return this->mUnk_0C; }
// clang-format on
PlayerActorBase_70_0C(PlayerCharacter character, unk32 param2) :
mpModel1(func_ov000_0208eadc(character, param2, true)),
mpModel2(func_ov000_0208eb44(character, param2, true)) {
ModelRender_Derived3 *unk_08;
ModelRender_Derived3 *unk_0C;
G3d_Model *pModel;
{
pModel = mpModel1;
if (!PlayerCharacter_IsNotLink2(character)) {
unk_08 = new(HeapIndex_1) ModelRender_Derived4(character, param2, pModel, NULL);
} else {
unk_08 = new(HeapIndex_1) ModelRender_Derived5(character, pModel, NULL);
}
this->mUnk_08 = unk_08;
}
{
pModel = mpModel2;
if (!PlayerCharacter_IsNotLink(character)) {
unk_0C = new(HeapIndex_1) ModelRender_Derived4(character, param2, pModel, unk_08->mRenderObj.cacheJntAnm);
} else {
unk_0C = new(HeapIndex_1) ModelRender_Derived5(character, pModel, unk_08->mRenderObj.cacheJntAnm);
}
this->mUnk_0C = unk_0C;
}
}
};
class PlayerActorBase_70_1C : public UnkStruct_PlayerGet_74_base {
private:
/* 00 (base) */
/* 04 */ STRUCT_PAD(0x04, 0x2C);
/* 2C */
public:
PlayerActorBase_70_1C(PlayerActorBase_70 *pParent);
// data_ov000_020b2b9c
/* 00 */ virtual void vfunc_00(unk32 param1, unk32 param2, unk32 param3) override;
};
class PlayerActorBase_70_30 {
private:
/* 00 */ STRUCT_PAD(0x00, 0x1C);
/* 1C */
public:
PlayerActorBase_70_30(PlayerCharacter character, ModelRender_UnkSystem1 *param2, ModelRender_UnkSystem1 *param3);
};
class PlayerActorBase_70_6C {
private:
/* 00 */ UnkSystem5 mUnk_00;
/* 20 */ STRUCT_PAD(0x20, 0x70);
/* 70 */
public:
PlayerActorBase_70_6C(PlayerCharacter character, void *pBTX, G3d_Model *pModel);
~PlayerActorBase_70_6C();
};
class PlayerActorBase_70_DC {
private:
/* 00 */ UnkSystem5 mUnk_00;
/* 20 */ STRUCT_PAD(0x20, 0x60);
/* 60 */
public:
PlayerActorBase_70_DC(PlayerCharacter character, G3d_Model *pModel);
~PlayerActorBase_70_DC();
};
class PlayerActorBase_70_E0 {
private:
/* 00 */ unk32 mUnk_00;
public:
PlayerActorBase_70_E0(ModelRender_Derived3 *pUnk_08, PlayerCharacter character) {
unk32 value;
if (pUnk_08->mpModel != NULL) {
value = pUnk_08->func_ov000_02057f18(data_ov000_020ab4dc[character].mUnk_14);
} else {
value = -1;
}
this->mUnk_00 = value;
}
};
class PlayerActorBase_70_E4 {
private:
/* 00 */ STRUCT_PAD(0x00, 0x30);
/* 30 */
public:
PlayerActorBase_70_E4();
};
class PlayerActorBase_70_134 {
private:
/* 00 */ STRUCT_PAD(0x00, 0x28);
/* 28 */
public:
PlayerActorBase_70_134();
};
struct UnkStruct_func_ov000_020830d4 {
u16 mUnk_00;
u16 mUnk_04;
u8 mUnk_08;
u32 mUnk_0C;
};
struct UnkStruct_func_ov001_020bbe18 {
u16 mUnk_00;
};
class PlayerActorBase_70 {
private:
/* 000 */ BOOL mIsNotLink;
/* 004 */ PlayerCharacter mCharacter;
/* 008 */ unk32 mUnk_008;
/* 014 */ PlayerActorBase_70_0C mUnk_00C;
/* 01C */ PlayerActorBase_70_1C *mUnk_01C;
/* 020 */ ModelRender_UnkSystem1 *mUnk_020;
/* 024 */ ModelRender_UnkSystem1 *mUnk_024;
/* 028 */ ModelRender_UnkSystem1 *mUnk_028;
/* 02C */ ModelRender_UnkSystem1 *mUnk_02C;
/* 030 */ PlayerActorBase_70_30 mUnk_030;
/* 04C */ PlayerActorBase_70_30 mUnk_04C;
/* 068 */ unk16 mUnk_068;
/* 06A */ unk16 mUnk_06A;
/* 06C */ PlayerActorBase_70_6C mUnk_06C;
/* 0DC */ PlayerActorBase_70_DC *mUnk_0DC;
/* 0E0 */ PlayerActorBase_70_E0 mUnk_0E0;
/* 0E4 */ PlayerActorBase_70_E4 mUnk_0E4;
/* 114 */ Mat4x3p *mUnk_114;
/* 118 */ unk32 mUnk_118;
/* 11C */ unk32 mUnk_11C;
/* 120 */ unk32 mUnk_120;
/* 124 */ unk16 mUnk_124;
/* 126 */ bool mUnk_126;
/* 127 */ bool mUnk_127;
/* 128 */ bool mUnk_128;
/* 129 */ bool mUnk_129;
/* 12A */ bool mUnk_12A;
/* 12B */ bool mUnk_12B;
/* 12C */ bool mUnk_12C;
/* 12D */ bool mUnk_12D;
/* 12E */ bool mUnk_12E;
/* 12F */ bool mUnk_12F;
/* 130 */ bool mUnk_130;
/* 131 */ bool mUnk_131;
/* 132 */ unk16 mUnk_132;
/* 134 */ PlayerActorBase_70_134 mUnk_134;
/* 15C */ unk32 mUnk_15C;
/* 160 */
public:
PlayerActorBase_70(PlayerCharacter character, unk32 param2);
~PlayerActorBase_70();
// overlay 0
void func_ov000_02082e78(unk32 param1, unk32 param2, unk32 param3, unk32 param4);
void func_ov000_020830d4(UnkStruct_func_ov001_020bbe18 param1, u32 param2, u8 param3, unk32 param4);
// overlay 1
void func_ov001_020bbe18(unk32 param1, UnkStruct_func_ov001_020bbe18 param2, u32 param3, u8 param4);
};
class PlayerActorBase_74 {
private:
/* 00 */ STRUCT_PAD(0x00, 0x34);
/* 34 */
public:
PlayerActorBase_74() {
this->func_ov001_020db190();
}
void func_ov001_020db190();
};
struct PlayerActorBase_78_04 {
STRUCT_PAD(0x00, 0x0C);
void func_ov000_0205c584(unk32 param1, unk32 param2);
};
class PlayerActorBase_78 {
private:
/* 00 */ STRUCT_PAD(0x00, 0x0C);
/* 0C */
public:
void func_ov000_0205c584(volatile unk32 param1, volatile unk32 param2);
};
class PlayerLinkActor_9C_34 {
private:
/* 00 */ unk32 mUnk_00;
/* 04 */ VecFx32 mUnk_04;
/* 10 */ VecFx32 mUnk_10;
public:
void func_ov000_0208efd0(VecFx32 *pVec);
};
class PlayerLinkActor_9C {
public:
/* 000 (vtable) */
/* 004 */ STRUCT_PAD(0x04, 0x34);
/* 034 */ PlayerLinkActor_9C_34 mUnk_34;
/* 004 */ STRUCT_PAD(0x50, 0xF4);
/* 0F4 */ unk32 mUnk_0F4;
/* 0F8 */ STRUCT_PAD(0xF8, 0x154);
/* 154 */
PlayerLinkActor_9C(UnkStruct_027e0ce0_40 *param1, u32 rawGrabParams, PlayerCharacter character);
// data_ov000_020b2a8c
/* 00 */ virtual ~PlayerLinkActor_9C();
};
class PlayerActorBase {
public:
/* 00 */ VecFx32 mPos;
/* 0C */ VecFx32 mPrevPos;
/* 18 */ VecFx32 mVel;
/* 24 */ VecFx32 mAccel;
/* 30 */ union {
u16 mAngle;
UnkStruct_func_ov001_020bbe18 mAngleStruct;
};
/* 32 */ u8 mInvincibilityTimer;
/* 33 */ u8 mInvincibilityIconTimer; // the blinking icon on top-screen
/* 34 */ ActorRef mGrabActor;
/* 38 */ PlayerActorBase_38 mUnk_38;
/* 44 */ unk32 mUnk_44;
/* 48 */ PlayerCharacter mCharacter;
/* 4C */ unk32 mUnk_4C;
/* 50 */ ActorGrabParams mUnk_50;
/* 54 */ unk32 mUnk_54;
/* 58 */ UnkStruct_027e0ce0_40 *mUnk_58;
/* 5C */ PlayerActorBase_5C mUnk_5C;
/* 70 */ PlayerActorBase_70 *mUnk_70;
/* 74 */ PlayerActorBase_74 *mUnk_74;
/* 78 */ PlayerActorBase_78 mUnk_78;
/* 84 */ UnkStruct_ov019_020d24c8_28_258_00 mUnk_84;
/* 8C */ unk32 mUnk_8C;
/* 90 */ PlayerLinkActor_9C *mUnk_90;
/* 94 */
PlayerActorBase(PlayerCharacter character, unk32 param2, unk32 param3, UnkStruct_027e0ce0_40 *param4);
~PlayerActorBase();
// overlay 0
void func_ov000_0208c8f8(VecFx32 *pVec);
void func_ov000_0208c914();
void func_ov000_0208d3fc();
void func_ov000_0208d7f0(bool param1);
// overlay 1
void func_ov001_020bc96c(); // ResetState? or just Reset? idk
};
include/Player/PlayerGet.hpp
-9
View File
@@ -101,15 +101,6 @@ public:
}
};
class UnkStruct_PlayerGet_74_base {
public:
/* 00 (vtable) */
/* 00 */ virtual void vfunc_00(unk32 param1, unk32 param2, unk32 param3);
UnkStruct_PlayerGet_74_base();
};
class UnkStruct_PlayerGet_74 : public UnkStruct_PlayerGet_74_base {
public:
/* 00 (base) */
include/Player/PlayerLink.hpp
+175
View File
@@ -0,0 +1,175 @@
#pragma once
#include "Player/PlayerActorBase.hpp"
class UnkStruct_027e0ce0_40;
class PlayerLinkActor_A0_38;
class PlayerLinkActor_A0_38_04_Base : public LinkList<PlayerLinkActor_A0_38_04_Base> {
public:
/* 00 (vtable) */
/* 04 (base) */
/* 0C */ unk32 mUnk_0C;
/* 10 */ PlayerLinkActor_A0_38 *mUnk_10;
/* 14 */
PlayerLinkActor_A0_38_04_Base(PlayerLinkActor_A0_38 *param1) {
this->mUnk_0C = 0;
this->mUnk_10 = param1;
}
/* 00 */ virtual void vfunc_00();
};
class PlayerLinkActor_A0_38_04 : public PlayerLinkActor_A0_38_04_Base {
public:
/* 00 (vtable) */
/* 04 (base) */
/* 0C */
PlayerLinkActor_A0_38_04(PlayerLinkActor_A0_38 *param1) :
PlayerLinkActor_A0_38_04_Base(param1) {}
// data_ov024_020d8250
/* 00 */ virtual void vfunc_00() override;
};
class PlayerLinkActor_A0_38_18 : public PlayerLinkActor_A0_38_04_Base {
public:
/* 00 (vtable) */
/* 04 (base) */
/* 0C */
PlayerLinkActor_A0_38_18(PlayerLinkActor_A0_38 *param1) :
PlayerLinkActor_A0_38_04_Base(param1) {}
// data_ov024_020d8244
/* 00 */ virtual void vfunc_00() override;
};
class PlayerLinkActor_A0_38 {
public:
/* 00 */ unk16 mUnk_00;
/* 02 */ unk16 mUnk_02;
/* 04 */ PlayerLinkActor_A0_38_04 mUnk_04;
/* 18 */ PlayerLinkActor_A0_38_18 mUnk_18;
/* 2C */ Vec2s mUnk_2C;
/* 30 */ u16 mUnk_30;
/* 32 */ unk16 mUnk_32;
/* 34 */ u16 mUnk_34;
/* 36 */ bool mUnk_36;
/* 37 */ bool mUnk_37;
/* 38 */
PlayerLinkActor_A0_38();
~PlayerLinkActor_A0_38();
void func_ov024_020d19d8();
};
class PlayerLinkActor_A0 {
public:
/* 00 */ STRUCT_PAD(0x00, 0x38);
/* 38 */ PlayerLinkActor_A0_38 *mUnk_38;
/* 3C */ STRUCT_PAD(0x3C, 0x94);
/* 94 */
PlayerLinkActor_A0(unk32 param1, UnkStruct_027e0ce0_40 *param2, PlayerActorBase *pPlayer, PlayerLinkActor_9C *param4);
~PlayerLinkActor_A0();
// overlay 0
u32 func_ov000_02093718();
u8 func_ov000_0209378c(); // bool?
// overlay 1
void func_ov001_020bd2e0();
void func_ov001_020bd358();
void func_ov001_020bd388(bool param1, bool param2);
};
class PlayerLinkActor_A4 {
public:
/* 00 */ unk32 mUnk_00;
/* 04 */ unk32 mUnk_04;
/* 08 */ bool mUnk_08;
/* 09 */ unk8 mUnk_09;
/* 0A */ unk8 mUnk_0A;
/* 0B */ unk8 mUnk_0B;
/* 0C */
PlayerLinkActor_A4(PlayerActorBase *pPlayer, PlayerLinkActor_A0 *param2);
~PlayerLinkActor_A4();
};
class PlayerLinkActor_134 {
public:
/* 00 */ UnkStruct_PlayerGet_ec mUnk_00;
/* 04 */ unk32 mUnk_04;
/* 08 */
PlayerLinkActor_134() :
mUnk_00(NULL) {
this->mUnk_04 = 0;
}
~PlayerLinkActor_134() {
this->func_ov031_020db0fc();
}
// overlay 31
void func_ov031_020db0fc();
};
class PlayerLinkActor_1B0 : public UnkSystem7 {
public:
/* 00 (base) */
/* 04 */ unk32 mUnk_04;
/* 08 */ unk32 mUnk_08;
/* 0C */
PlayerLinkActor_1B0();
// ~PlayerLinkActor_1B0() {}
};
class PlayerLinkActor : public PlayerActorBase {
public:
/* 000 (base) */
/* 094 */ bool *mUnk_094;
/* 098 */ unk32 mUnk_098;
/* 09C */ PlayerLinkActor_9C *mUnk_09C;
/* 0A0 */ PlayerLinkActor_A0 *mUnk_0A0;
/* 0A4 */ PlayerLinkActor_A4 mUnk_0A4;
/* 0B0 */ u32 mUnk_0B0;
/* 0B4 */ bool mUnk_0B4;
/* 0B5 */ bool mUnk_0B5;
/* 0B6 */ bool mUnk_0B6;
/* 0B7 */ bool mUnk_0B7;
/* 0B8 */ bool mUnk_0B8;
/* 0B9 */ bool mUnk_0B9;
/* 0BA */ bool mUnk_0BA;
/* 0BB */ bool mUnk_0BB;
/* 0BC */ CellAnimObject mUnk_0BC;
/* 134 */ PlayerLinkActor_134 *mUnk_134;
/* 138 */ CellAnimObject mUnk_138; // sanctuary link icon animation
/* 1B0 */ PlayerLinkActor_1B0 mUnk_1B0[3];
/* 1D4 */
PlayerLinkActor(unk32 param1, unk32 param2, UnkStruct_027e0ce0_40 *param3, bool *param4);
~PlayerLinkActor();
// overlay 1
void func_ov001_020bcb60(unk32 param1);
void func_ov001_020bcb70();
void func_ov001_020bcba8();
void func_ov001_020bcbd0(VecFx32 *pVec);
// overlay 21
void func_ov021_020ebda0();
void func_ov021_020ebda0(int);
// overlay 31
void func_ov031_020d96a4(PlayerLinkActor_A0 *param1, UnkStruct_027e0ce0_40 *param2);
void func_ov031_020d96a4(int, PlayerLinkActor_A0 *param1, UnkStruct_027e0ce0_40 *param2);
void func_ov031_020dccf0();
void func_ov031_020dccf0(int);
};
include/Player/PlayerPhantom.hpp
+14
View File
@@ -0,0 +1,14 @@
#pragma once
#include "Player/PlayerActorBase.hpp"
class UnkStruct_027e0ce0_40;
class PlayerPhantomActor : public PlayerActorBase {
public:
/* 000 (base) */
/* 094 */ unk32 mUnk_94;
/* 098 */ unk32 mUnk_98;
PlayerPhantomActor(unk32 param1, unk32 param2, UnkStruct_027e0ce0_40 *param3, bool *param4);
};
include/Player/PlayerZelda.hpp
+14
View File
@@ -0,0 +1,14 @@
#pragma once
#include "Player/PlayerActorBase.hpp"
class UnkStruct_027e0ce0_40 :
class PlayerZeldaActor : public PlayerActorBase {
public:
/* 000 (base) */
/* 094 */ unk32 mUnk_94;
/* 098 */ unk32 mUnk_98;
PlayerZeldaActor(unk32 param1, unk32 param2, UnkStruct_027e0ce0_40 *param3, bool *param4);
};
include/Render/ModelRender.hpp
+27
View File
@@ -6,6 +6,8 @@
#include <nns/g3d/g3d.h>
extern "C" void *func_ov000_02057750(size_t allocSize);
typedef void (*UnkSystem4_UnkCallback)(void);
class UnkSystem4_vfunc_1C_B4 {
@@ -43,6 +45,10 @@ public:
/* 14 */ virtual void vfunc_14(Mat3p *param1, VecFx32 *param2) = 0;
/* 18 */ virtual void vfunc_18(VecFx32 *param1) = 0;
/* 1C */
unk32 func_ov000_02057f18(const void *param1);
unk32 func_ov000_02057f40(const void *param1);
const G3d_Model_14 *func_ov000_02057ee0() const;
};
class ModelRender : public ModelRenderBase {
@@ -65,6 +71,8 @@ public:
/* 20 */ virtual void vfunc_20();
void func_ov000_02057c38(unk32 param1, unk32 param2);
void func_ov000_02057d20(u8 numBones);
void func_ov000_02057d3c(G3d_BoneMtxStruct *pCacheJntAnm);
void func_ov000_0209a7b8(void *param1, UnkSystem4_UnkCallback param2);
};
@@ -190,3 +198,22 @@ public:
// data_ov024_020d84bc
/* 00 */ virtual ~ModelRender_Derived2() override {}
};
class ModelRender_UnkSystem1 {
public:
/* 00 */ UnkSystem5 mUnk_00;
/* 20 */
ModelRender_UnkSystem1(G3d_Model *pModel, size_t allocSize) :
mUnk_00(func_ov000_02057750(allocSize), pModel) {}
~ModelRender_UnkSystem1();
};
class ModelRender_UnkSystem1_Derived1 : public ModelRender_UnkSystem1 {
public:
/* 00 (base) */
/* 20 */
ModelRender_UnkSystem1_Derived1(G3d_Model *pModel, size_t allocSize);
};
include/Unknown/Common.hpp
+23 -6
View File
@@ -218,14 +218,17 @@ struct UnkStruct_ov019_020d24c8_28_258_00 {
/* 04 */ unk32 mUnk_04;
/* 08 */
UnkStruct_ov019_020d24c8_28_258_00() {
this->mUnk_00 = NULL;
this->mUnk_04 = 0;
}
UnkStruct_ov019_020d24c8_28_258_00() {}
UnkStruct_ov019_020d24c8_28_258_00(void *param1, unk32 param2) :
mUnk_00(param1),
mUnk_04(param2) {}
void Init() {
this->mUnk_00 = NULL;
this->mUnk_04 = 0;
}
void func_ov000_0205fc20(unk32 param1, unk32 param2, void *param3, void *param4);
};
@@ -233,6 +236,9 @@ struct UnkStruct_ov019_020d24c8_28_258_00_Derived1 : public UnkStruct_ov019_020d
/* 00 (base) */
/* 08 */ unk32 mUnk_08;
/* 0C */
UnkStruct_ov019_020d24c8_28_258_00_Derived1() :
UnkStruct_ov019_020d24c8_28_258_00(NULL, 0) {}
};
class UnkStruct_ov019_020d24c8_28_258 : public UnkStruct_ov019_020d24c8_28_258_00 {
@@ -248,12 +254,14 @@ public:
/* 16 */ unk16 mUnk_16;
/* 18 */
UnkStruct_ov019_020d24c8_28_258() {
UnkStruct_ov019_020d24c8_28_258() :
UnkStruct_ov019_020d24c8_28_258_00(NULL, 0) {
this->mPos.x = 0;
this->mPos.y = 0;
};
UnkStruct_ov019_020d24c8_28_258(s16 param1, unk32 param2) {
UnkStruct_ov019_020d24c8_28_258(s16 param1, unk32 param2) :
UnkStruct_ov019_020d24c8_28_258_00(NULL, 0) {
this->UnknownAction(param1, param2);
}
@@ -1220,3 +1228,12 @@ public:
// data_ov000_020b24c4
/* 00 */ virtual void vfunc_00();
};
class UnkStruct_PlayerGet_74_base {
public:
/* 00 (vtable) */
/* 00 */ virtual void vfunc_00(unk32 param1, unk32 param2, unk32 param3);
UnkStruct_PlayerGet_74_base();
};
include/Unknown/UnkStruct_027e0cdc.hpp
+3 -2
View File
@@ -3,15 +3,16 @@
#include "global.h"
#include "types.h"
class UnkStruct_027e0cdc {
class UnkStruct_027e0cdc : public AutoInstance<UnkStruct_027e0cdc> {
public:
/* 00 */ unk32 mUnk_00;
UnkStruct_027e0cdc();
~UnkStruct_027e0cdc();
unk32 func_ov000_02082a28(unk32 param1);
unk32 func_ov000_02082a48(unk32 param1);
static void Destroy();
};
extern UnkStruct_027e0cdc *data_027e0cdc;
include/Unknown/UnkStruct_027e0ce0.hpp
+3 -3
View File
@@ -6,7 +6,7 @@
#include "Actor/ActorRef.hpp"
#include "Item/ItemManager.hpp"
#include "LinkList.hpp"
#include "Player/Player.hpp"
#include "Player/PlayerLink.hpp"
#include "Player/TouchControl.hpp"
#include "Save/SaveManager.hpp"
#include "System/SysNew.hpp"
@@ -367,9 +367,9 @@ public:
/* 148 */ void *mUnk_148;
/* 14C */ UnkStruct_027e0ce0_40_14C *mUnk_14C;
/* 150 */ UnkStruct_027e0ce0_40_150 *mUnk_150;
/* 154 */ PlayerActor mPlayer;
/* 154 */ PlayerLinkActor mPlayer;
/* 328 */ UnkStruct_027e0ce0_40_328 *mUnk_328;
/* 32C */ PlayerActor *mpPlayer; // set to mPlayer
/* 32C */ PlayerLinkActor *mpPlayer; // set to mPlayer
/* 330 */ UnkStruct_027e0ce0_40_328 *mUnk_330; // set to mUnk_328
/* 334 */ ItemFlag mEquippedItem;
/* 338 */ bool mIsSceneTowerInteriorStairs;
include/Unknown/UnkStruct_027e0cf8.hpp
+2 -1
View File
@@ -142,7 +142,8 @@ public:
/* 1B */ bool mUnk_1B;
/* 1C */
UnkStruct_027e0cf8_0C_00() {}
UnkStruct_027e0cf8_0C_00() :
mUnk_00(NULL, 0) {}
void func_ov024_020cff1c();
};
include/Unknown/UnkStruct_027e0d34.hpp
+4 -2
View File
@@ -9,13 +9,15 @@ public:
bool func_ov000_02093bc8(unk32 param1);
};
class UnkStruct_027e0d34 {
class UnkStruct_027e0d34 : public AutoInstance<UnkStruct_027e0d34> {
public:
/* 00 */ unk32 mUnk_00;
/* 04 */ UnkStruct_027e0d34_04 *mUnk_04;
UnkStruct_027e0d34();
~UnkStruct_027e0d34();
// overlay 1
static void Destroy();
// overlay 31
bool func_ov031_020d97e4();
include/Unknown/UnkStruct_ov000_0208f820.hpp
+1 -1
View File
@@ -32,7 +32,7 @@ public:
/* 0A */ unk16 mUnk_0A;
/* 0C */
UnkStruct_PlayerGet_64(void *param1, unk32 param2);
UnkStruct_PlayerGet_64(void *param1);
~UnkStruct_PlayerGet_64();
void func_ov000_0208a100();
include/types.h
+2 -2
View File
@@ -40,8 +40,8 @@ typedef void (*UnkCallback)(u16 param1);
template <typename T> class Instance {
public:
Instance();
~Instance();
Instance(); //! TODO: should this be inlined?
~Instance(); //! TODO: should this be inlined?
};
template <typename T> class AutoInstance : public Instance<T> {