mirror of
https://github.com/zeldaret/st
synced 2026-09-02 01:43:15 -04:00
CLLT and progress in TLKT (#132)
* feat: wip soontm * feat: enhance TLTK * feat: complete TLKT * fix: refactor went wild * fix: update MLCK * fix: hmmm * fix: continue reverse wrong refactor * style: remove comment * feat: delink destructors of ActorUnkTLKTnCLLT_Base
This commit is contained in:
@@ -3,7 +3,6 @@
|
||||
#include "Animation/CellAnimObject.hpp"
|
||||
#include "Game/GameModeManager.hpp"
|
||||
#include "LinkList.hpp"
|
||||
#include "System/SysNew.hpp"
|
||||
#include "Unknown/UnkFileSystem.hpp"
|
||||
#include "global.h"
|
||||
#include "math.hpp"
|
||||
@@ -11,7 +10,6 @@
|
||||
#include "types.h"
|
||||
|
||||
#include <nitro/mi.h>
|
||||
#include <nns/g3d/g3d.h>
|
||||
#include <nns/text.h>
|
||||
|
||||
class UnkDataStruct2;
|
||||
@@ -888,12 +886,61 @@ struct UnkStruct_StackTitleScreen {
|
||||
|
||||
class MapObject;
|
||||
|
||||
class MapObject_UnkStruct1 {
|
||||
public:
|
||||
/* 00 (vtable) */
|
||||
/* 04 */ union {
|
||||
struct {
|
||||
bool mUnk_04b;
|
||||
bool mUnk_05;
|
||||
};
|
||||
unk32 mUnk_04;
|
||||
};
|
||||
/* 08 */
|
||||
|
||||
// MapObject_UnkStruct1(); // func_ov000_02073194 & func_ov000_020731c4
|
||||
|
||||
// data_ov000_020b2290
|
||||
/* 00 */ virtual void vfunc2_00();
|
||||
/* 04 */ virtual void vfunc2_04();
|
||||
/* 08 */ virtual void vfunc2_08();
|
||||
/* 0C */ virtual void vfunc2_0C();
|
||||
};
|
||||
|
||||
class MapObject_UnkStruct1_Derived1 : public MapObject_UnkStruct1 {
|
||||
public:
|
||||
/* 00 (base) */
|
||||
/* 08 */ unk16 mUnk_48;
|
||||
/* 0A */ s16 mUnk_4A;
|
||||
/* 0C */ VecFx32 mUnk_4C;
|
||||
/* 18 */ bool mUnk_58;
|
||||
/* 19 */ unk8 mUnk_59;
|
||||
/* 1A */ s16 mUnk_5A;
|
||||
/* 1C */ VecFx32 mUnk_5C;
|
||||
/* 28 */
|
||||
|
||||
MapObject_UnkStruct1_Derived1(); // func_ov000_02073234
|
||||
|
||||
// data_ov000_020b22a8
|
||||
/* 0C */ virtual void vfunc2_0C() override;
|
||||
};
|
||||
|
||||
class MapObject_UnkStruct1_Derived2 : public MapObject_UnkStruct1_Derived1 {
|
||||
public:
|
||||
/* 00 (base) */
|
||||
/* 28 */
|
||||
|
||||
// data_ov031_021150a0
|
||||
/* 04 */ virtual void vfunc2_04() override;
|
||||
/* 08 */ virtual void vfunc2_08() override;
|
||||
};
|
||||
|
||||
struct UnkStackStruct1 {
|
||||
/* 00 */ u8 mUnk_00;
|
||||
/* 01 */ unk8 mUnk_01;
|
||||
/* 02 */ unk8 mUnk_02;
|
||||
/* 03 */ unk8 mUnk_03;
|
||||
/* 04 */ void *mUnk_04;
|
||||
/* 04 */ MapObject_UnkStruct1 *mUnk_04;
|
||||
/* 08 */ unk32 mUnk_08;
|
||||
/* 0C */ VecFx32 mUnk_0C;
|
||||
/* 18 */ unk16 mUnk_18;
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
#include "Item/Item.hpp"
|
||||
#include "global.h"
|
||||
#include "nitro/fx.h"
|
||||
#include "types.h"
|
||||
|
||||
class UnkStruct_027e0d34_04 {
|
||||
@@ -24,6 +25,7 @@ public:
|
||||
bool func_ov031_020d97e4();
|
||||
bool func_ov031_020d97f4();
|
||||
void func_ov031_020d9844();
|
||||
void func_ov031_020d9854(VecFx32 *param1, fx32 param2);
|
||||
void func_ov031_020d994c();
|
||||
void func_ov031_020d996c();
|
||||
bool TryItemGive(ItemId itemId);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "Actor/ActorRef.hpp"
|
||||
#include "Message/BMG.hpp"
|
||||
#include "System/SysNew.hpp"
|
||||
#include "global.h"
|
||||
#include "types.h"
|
||||
|
||||
@@ -75,8 +75,8 @@ public:
|
||||
/* 20 */ unk32 mUnk_20;
|
||||
/* 24 */ unk32 mUnk_24;
|
||||
/* 28 */ unk8 mUnk_28;
|
||||
/* 2C */ unk32 mUnk_2C;
|
||||
/* 30 */ unk32 mUnk_30;
|
||||
/* 2C */ ActorRef mUnk_2C;
|
||||
/* 30 */ ActorRef mUnk_30;
|
||||
/* 34 */
|
||||
|
||||
UnkSystem1_ov000_Derived2(unk32 param1);
|
||||
|
||||
Reference in New Issue
Block a user