mirror of
https://github.com/zeldaret/st
synced 2026-07-06 21:52:49 -04:00
Decompile overlay 1 (Part 5) (#100)
* 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:
@@ -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();
|
||||
};
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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();
|
||||
};
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user