Files
st/include/Actor/ActorUnkZLSL_ZSRS.hpp
T
Mityno 7c266293a7 Decompiling ActorUnkCANS (#103)
* feat: Start decompiling ActorUnkCANS ctor and vfunc_10

* feat: Improve vfunc_10

* feat: Decompile vfunc_18 and 1C

* fix: Remove trailing return

* feat: Progress on vfunc_20

* fix: Rename symbol

* feat: Finish first run over vfunc_20

* feat: Improve vfunc_20

* feat: Improve vfunc_20

* feat: Heavily improve vfunc_20

Almost done

* feat: Keep vfunc_20 going, add UnkAngleStruct to Actor.hpp

* feat: Some polish on vfunc_20

That's about what I can do, there are some tweaks left but I'm unable to
get anywhere.
Kind of proud ngl

* feat: Rename symbols and match vfunc_24

* fix: Fix jp symbol conflict

* feat: Decompile vfunc_2C

* feat: Fix symbols and signatures

* fix: Match switch statement by adding every cases

* feat: Match func_ov063_02157fa4

* feat: Match func_ov063_02158424

* feat: Match func_ov063_02158448

* feat: Match func_ov063_02158490

* feat: Match func_ov063_02158b0c

* feat: Match func_ov063_02158b34

* feat: Decompile most of func_ov063_02158b98 (need regalloc fix)

* feat: Create inner classes of ActorUnkCANS, match some vfuncs

* feat: Update some dtor symbol and match some ctor

* feat: Decompile UnkStruct 02162ee8 ctor

* feat: Rename jp symbols

* feat: Match func_ov063_021590c8

* feat: Match func_ov063_02159dfc

* feat: Decompile some functions

* fix: Fix old accesses

* fix: More merge artifacts

* fix: More merge artifacts

* chore: Move structs around and fix some uses

* feat: Start decompiling func_ov063_02158db0

* feat: Decompile some vfunc

vfunc_0C is really really weird

* fix: Fix use of removed struct

* feat: Match func_ov063_02159258

* feat: Match func_ov063_02159494

* feat: Match func_ov063_021595a4

* feat: Match func_ov063_02159618

* feat: Match func_ov063_02159714

* feat: Match func_ov063_02159784

* fix: Move UnkAngleStruct to math.hpp

* fix: .data of ActorRollingStone & ActorShotArrow

* feat: Match func_ov063_021598fc

* fix: Cleanup code for func_ov063_021598fc

* feat: Match func_ov063_02159ca8

* feat: Match func_ov063_02159d68

* fix: Fix double declaration of func

* feat: Match func_ov063_02159e20

* feat: Decompile most of func_ov063_02159ec0

* feat: Match func_ov063_0215a428

* feat: Match func_ov063_0215a474

* feat: Update lots of symbols (mainly for jp)

* feat: Start decompiling two funcs with fx mul

* fix: Fix broken symbol def after merge

* feat: Match func_ov063_0215a514

* feat: Match func_ov063_0215a56c

* feat: Match func_ov063_0215a5a0

* feat: Match func_ov063_0215a5bc

* feat: Match func_ov063_0215a5d8

* feat: Decompile most of func_ov063_0215a678

* fix: Fix some regalloc order in func_ov063_0215a678

* feat: Update symbols and create unk class

* feat: Update CANS member with the new class

* feat: Update symbols, remove dead variables

* feat: Improve ctor and some local struct layout

* feat: Improve ActorUnkCANS ctor

* fix: Fix ActorUnkCANS members layout

* feat: Improve ActorUnkCANS ctor more

* fix: Fix wrong symbol reloc

* feat: Add intermediate struct and update symbols

* feat: Match some jp only code, symbols

* feat: Decompile part of func_ov063_0215a2c0

* fix: Fix jp only code in func_ov063_0215a2c0

* feat: Update symbols

* feat: Cleanup unused functions

* feat: Cleanup JP ifguards handling

* feat: Remove lot of useless temps, use DEG_TO_ANG where it seems appropriate

* feat: Small code cleanup

* Apply suggestions from code review

Co-authored-by: Alessevan <44125445+Alessevan@users.noreply.github.com>

* fix: Fix style

* feat: Apply suggestions from review

* feat: More code cleanup

* feat: Some more improvements

* fix: Remove auto-generated comment headers

* fix broken matches

* fix broken matches 2

---------

Co-authored-by: Alessevan <44125445+Alessevan@users.noreply.github.com>
Co-authored-by: Yanis002 <35189056+Yanis002@users.noreply.github.com>
2026-08-02 15:27:10 +02:00

395 lines
12 KiB
C++

#pragma once
#include "Actor/Actor.hpp"
#include "Actor/ActorProfile.hpp"
#include "Actor_Derived1.hpp"
#include "Player/PlayerGet.hpp"
#include "Render/ModelRender.hpp"
#include "global.h"
#include "types.h"
// --- Actor ZLSL ---
class UnkStruct_ov031_0211361c {
public:
// data_ov031_0211361c
virtual bool func_ov031_020ea0b4(Actor *param1);
};
// NPC Renderer ?
class ModelRender_ov000_020b4d64 : public ModelRender {
public:
/* 00 (base) */
/* 60 */
ModelRender_ov000_020b4d64(G3d_Model *pModel) :
ModelRender(pModel) {}
// data_ov000_020b4d64
/* 0C */ virtual void vfunc_0C() override;
/* 1C */ virtual void vfunc_1C(UnkSystem4_vfunc_1C *param1) override;
};
class ModelRender_ov031_02113670 : public ModelRender_ov000_020b4d64 {
public:
/* 00 (base) */
/* 60 */
ModelRender_ov031_02113670(G3d_Model *pModel) :
ModelRender_ov000_020b4d64(pModel) {}
// data_ov031_02113670
/* 0C */ virtual void vfunc_0C() override;
};
class UnkStruct_ov000_020b31a8 {
public:
/* 00 (vtable) */
/* 04 */ UnkSystem5 *mUnk_04;
/* 08 */ ModelRender *mUnk_08;
/* 0C */ unk32 mUnk_0C;
/* 10 */ unk32 mUnk_10;
/* 14 */ unk32 mUnk_14;
/* 18 */ unk8 mUnk_18; // deduced from strb [..., 0x18]
/* 19 */ STRUCT_PAD(0x19, 0x1C);
/* 1C */
UnkStruct_ov000_020b31a8(unk32 param1, unk32 param2, unk32 param3);
// data_ov000_020b31a8
/* 00 */ virtual ~UnkStruct_ov000_020b31a8();
/* 08 */ virtual void vfunc_08();
/* 0C */ virtual void vfunc_0C();
/* 10 */ virtual UnkSystem5 *vfunc_10();
/* 14 */ virtual void vfunc_14();
/* 18 */ virtual void vfunc_18();
/* 1C */ virtual void vfunc_1C(ActorUnkZLSL_AnimationTag param1, unk32 param2, unk32 param3, unk32 param4);
/* 20 */ virtual void vfunc_20();
/* 24 */ virtual void vfunc_24();
/* 28 */ virtual UnkStruct_PlayerGet_50 *vfunc_28();
/* 2C */ virtual void vfunc_2C();
/* 30 */ virtual s8 vfunc_30();
/* 34 */ virtual void vfunc_34();
/* 38 */ virtual void vfunc_38(unk32 param1, unk32 param2);
/* 3C */ virtual void vfunc_3C();
};
class ActorUnkZLSL_27CC : public UnkStruct_ov000_020b31a8 {
public:
/* 00 (base) */
/* 1C */
ActorUnkZLSL_27CC();
// data_ov031_0211369c
/* 30 */ virtual s8 vfunc_30() override;
/* 38 */ virtual void vfunc_38(unk32 param1, unk32 param2) override;
/* 3C */ virtual void vfunc_3C() override;
};
class ActorUnkZLSL_2700 : public ActorUnkZLSL_27CC {
public:
/* 00 (base) */
/* 04 */
// data_ov031_021136e4
void func_ov000_02099ddc(ActorUnkZLSL_AnimationTag param1, unk32 param2);
};
class UnkStruct_ov000_020b31f0 : public UnkStruct_ov000_020b31a8 {
public:
/* 00 (vtable) */
/* 1C */ UnkSystem5 *mUnk_1C;
/* 20 */ unk32 mUnk_20;
/* 24 */ unk32 mUnk_24;
/* 28 */ unk8 mUnk_28; // deduced from strb [..., 0x18]
/* 29 */ STRUCT_PAD(0x29, 0x2A);
/* 2A */ unk16 mUnk_2A;
/* 2C */
UnkStruct_ov000_020b31f0(void *param1, void *param2, void *param3, unk32 param4);
// data_ov000_020b31f0
/* 00 */ virtual ~UnkStruct_ov000_020b31f0() override;
/* 08 */ virtual void vfunc_08() override;
/* 0C */ virtual void vfunc_0C() override;
/* 10 */ virtual UnkSystem5 *vfunc_10() override;
/* 14 */ virtual void vfunc_14() override;
/* 1C */ virtual void vfunc_1C(ActorUnkZLSL_AnimationTag param1, unk32 param2, unk32 param3, unk32 param4) override;
/* 20 */ virtual void vfunc_20() override;
/* 28 */ virtual UnkStruct_PlayerGet_50 *vfunc_28() override;
/* 2C */ virtual void vfunc_2C() override;
/* 30 */ virtual s8 vfunc_30() override;
/* 34 */ virtual void vfunc_34() override;
/* 38 */ virtual void vfunc_38(unk32 param1, unk32 param2) override;
/* 3C */ virtual void vfunc_3C() override;
/* 40 */ virtual void vfunc_40();
};
class UnkStruct_ov031_0211372c : public UnkStruct_ov000_020b31f0 {
public:
/* 00 (base) */
/* 04 */ UnkSystem5 *mUnk_04;
/* 08 */ ModelRender *mUnk_08;
/* 0C */ STRUCT_PAD(0x0C, 0x1C);
/* 1C */ UnkSystem5 *mUnk_1C;
/* 20 */
UnkStruct_ov031_0211372c(void *param1, void *param2, void *param3, unk32 param4);
// data_ov031_0211372c
/* 18 */ virtual void vfunc_18() override;
/* 38 */ virtual void vfunc_38(unk32 param1, unk32 param2) override;
/* 3C */ virtual void vfunc_3C() override;
/* 40 */ virtual void vfunc_40() override;
};
class UnkStruct_ov031_02113d14 : public UnkStruct_ov031_0211372c {
public:
/* 00 (base) */
/* 20 */
UnkStruct_ov031_02113d14();
// data_ov031_02113d14
/* 00 */ virtual ~UnkStruct_ov031_02113d14();
};
class ActorUnkZLSL;
class UnkStruct_ov031_020ecc68 {
public:
/* 08 */ unk16 sp_08;
/* 0A */ unk16 sp_0A;
/* 0C */ unk16 sp_0C;
/* 0E */ unk16 sp_0E;
/* 10 */ unk32 sp_10;
/* 14 */ VecFx32 sp_14;
/* 20 */ u16 sp_20;
/* 22 */ u16 sp_22;
/* 24 */ u16 sp_24;
/* 26 */ u16 sp_26;
/* 28 */ VecFx32 sp_28;
/* 34 */ UnkStackStruct1 sp_34;
void func_ov031_020ed47c(ActorUnkZLSL *param1, unk32 param2);
};
// --- Actor ZLSL ---
enum ActorUnkZLSLState_ {
ActorUnkZLSLState_0 = 0,
ActorUnkZLSLState_1 = 1,
ActorUnkZLSLState_2 = 2,
ActorUnkZLSLState_3 = 3,
ActorUnkZLSLState_4 = 4,
ActorUnkZLSLState_5 = 5,
ActorUnkZLSLState_6 = 6,
ActorUnkZLSLState_7 = 7,
ActorUnkZLSLState_8 = 8,
ActorUnkZLSLState_9 = 9,
ActorUnkZLSLState_10 = 10,
ActorUnkZLSLState_11 = 11,
ActorUnkZLSLState_12 = 12,
ActorUnkZLSLState_13 = 13,
ActorUnkZLSLState_14 = 14,
ActorUnkZLSLState_15 = 15,
ActorUnkZLSLState_16 = 16,
ActorUnkZLSLState_MAX
};
class ActorUnkZLSL_1690 {
public:
/* 00 */ unk32 mUnk_00;
void func_ov031_020eeca8();
void func_ov031_020eece8();
};
class ActorUnkZLSL : public Actor_Derived1 {
public:
/* 0000 (base) */
/* 0120 */ STRUCT_PAD(0x120, 0x1620);
/* 1620 */ ModelRender_ov031_02113670 mUnk_1620;
/* 1680 */ STRUCT_PAD(0x1680, 0x1690);
/* 1690 */ ActorUnkZLSL_1690 mUnk_1690;
/* 1694 */ STRUCT_PAD(0x1694, 0x2700);
/* 2700 */ ActorUnkZLSL_2700 mUnk_2700;
/* 2704 */ STRUCT_PAD(0x271C, 0x276C);
/* 276C */ ModelRender_ov031_02113670 mUnk_276C;
/* 27CC */ ActorUnkZLSL_27CC mUnk_27CC;
/* 1694 */ STRUCT_PAD(0x27E8, 0x2800);
/* 2800 */ unk32 mUnk_2800;
/* 2804 */ STRUCT_PAD(0x2804, 0x2828);
/* 2828 */ UnkStruct_PlayerGet_ec mUnk_2828;
/* 282C */ unk32 mUnk_282C;
/* 2830 */ unk32 mUnk_2830;
/* 2834 */ STRUCT_PAD(0x2834, 0x2838);
/* 2838 */ unk32 mUnk_2838;
/* 283C */ unk32 mUnk_283C;
/* 2840 */ STRUCT_PAD(0x2840, 0x2844);
/* 2844 */ unk32 mUnk_2844;
/* 2848 */ unk32 mUnk_2848;
/* 284C */ STRUCT_PAD(0x284C, 0x2850);
/* 2850 */ unk32 mUnk_2850;
/* 2854 */ unk32 mUnk_2854;
/* 2858 */ STRUCT_PAD(0x2858, 0x285C);
/* 285C */ unk32 mUnk_285C;
/* 2860 */ unk32 mUnk_2860;
/* 2864 */ STRUCT_PAD(0x2864, 0x286A);
/* 286A */ unk16 mUnk_286A;
/* 286C */ unk16 mUnk_286C;
/* 286E */ unk16 mUnk_286E;
/* 2870 */ unk16 mUnk_2870;
/* 2872 */ s16 mUnk_2872;
/* 2874 */ bool mUnk_2874;
/* 2875 */ STRUCT_PAD(0x2875, 0x2878);
/* 2878 */ VecFx32 mUnk_2878;
/* 2884 */ unk32 mUnk_2884;
/* 2888 */ fx32 mUnk_2888;
/* 288C */ unk32 mUnk_288C;
/* 2890 */ fx32 mUnk_2890;
/* 2894 */ Cylinder mUnk_2894;
/* 28A4 */ VecFx32 mUnk_28A4;
/* 28B0 */ VecFx32 mUnk_28B0;
/* 28BC */ unk32 mUnk_28BC;
/* 28C0 */ unk32 mUnk_28C0;
/* 28C4 */ unk32 mUnk_28C4;
/* 28C8 */ unk32 mUnk_28C8;
/* 2894 */ STRUCT_PAD(0x28CC, 0x28DC);
/* 28DC */ ActorRef mUnk_28DC;
/* 28E0 */ STRUCT_PAD(0x28E0, 0x28E4);
/* 28E4 */ unk16 mUnk_28E4;
/* 28E6 */ STRUCT_PAD(0x28E6, 0x28E8);
/* 28E8 */ VecFx32 mUnk_28E8;
/* 28F4 */ VecFx32 mUnk_28F4;
/* 2900 */ u16 mUnk_2900;
/* 2902 */ STRUCT_PAD(0x2902, 0x2904);
/* 2904 */ unk32 mUnk_2904;
/* 2908 */
ActorUnkZLSL();
// data_ov031_02113880
/* 00 */ virtual void GetOffsetPos(VecFx32 *pPos) const override;
/* 18 */ virtual bool vfunc_18(unk32 param1) override;
/* 20 */ virtual void vfunc_20() override;
/* 2C */ virtual void vfunc_2C(unk32 param1) override;
/* 4C */ virtual ~ActorUnkZLSL() override;
/* 58 */ virtual void vfunc_58(ActorState state) override;
/* 68 */ virtual void vfunc_68() override;
/* 6C */ virtual void vfunc_6C() override;
/* 70 */ virtual void vfunc_70() override;
/* 7C */ virtual unk32 vfunc_7C(unk32 param1) override;
/* 80 */ virtual unk32 vfunc_80(unk32 param1, unk32 param2) override;
/* 88 */ virtual bool vfunc_88() override;
/* 8C */ virtual bool vfunc_8C() override;
/* 98 */ virtual void vfunc_98(u32 param1) override;
/* A4 */ virtual void vfunc_A4() override;
/* AC */ virtual void vfunc_AC() override;
/* B0 */ virtual void vfunc_B0() override;
/* B4 */ virtual void vfunc_B4() override;
void func_ov031_020ea674();
void func_ov031_020ea7a8();
void func_ov031_020ecbe0();
void func_ov031_020eaa68();
void func_ov031_020ea86c();
void func_ov031_020ea868();
void func_ov031_020ea864();
void func_ov031_020eac64();
void func_ov031_020ead0c();
void func_ov031_020ec034();
void func_ov031_020ec05c();
void func_ov031_020ec0d4();
void func_ov031_020eb5f8();
void func_ov031_020ead7c();
void func_ov031_020eb188();
void func_ov031_020ebfd8();
void func_ov031_020eafe0();
void func_ov031_020eaa8c();
void func_ov031_020ec164();
void func_ov031_020eba58();
static void func_ov031_020ee1f4();
bool func_ov031_020ee724();
// not sure where they go
void func_ov031_020ea8c0();
void func_ov031_020ea8c4();
void func_ov031_020ea8c8();
void func_ov031_020eaa88();
void func_ov031_020eab0c();
void func_ov031_020eab40(unk32 param1);
void func_ov031_020eace0();
void func_ov031_020ead78();
void func_ov031_020eafb0();
void func_ov031_020eb158();
void func_ov031_020eb218();
bool func_ov031_020eb2b0(VecFx32 *param1, unk32 param2);
void func_ov031_020eb61c();
void func_ov031_020eba8c();
void func_ov031_020ec028();
void func_ov031_020ec058();
void func_ov031_020ec0a8();
void func_ov031_020ec12c();
void func_ov031_020ec170();
bool func_ov031_020ec3d0();
bool func_ov031_020ec49c();
unk32 func_ov031_020ec54c();
void func_ov031_020ec6d8(bool param1);
bool func_ov031_020ec8c4();
void func_ov031_020ecc68(unk32 param1);
void func_ov031_020ecea8(UnkAngleStruct param1, unk32 param2, unk32 param3, unk32 param4);
void func_ov031_020ed0b0();
void func_ov031_020ed3c0();
void func_ov031_020ed4e4(unk32 param1, unk32 param2);
void func_ov031_020ed55c();
bool func_ov031_020ed6cc(unk32 param1);
bool func_ov031_020ed8ac(unk32 param1);
void func_ov031_020edc80();
void func_ov031_020edd14(VecFx32 *param1);
void func_ov031_020edd54();
void func_ov031_020ede30();
void func_ov031_020edf98();
unk16 func_ov031_020ee2c8();
void func_ov031_020ee41c();
void func_ov031_020ee4c4(UnkAngleStruct angle);
void func_ov031_020ee654();
};
class ActorProfileUnkZLSL : public ActorProfile {
public:
/* 00 (base) */
ActorProfileUnkZLSL();
/* 0C */ virtual Actor *Create();
static ActorProfileUnkZLSL *GetProfile();
};
// --- Actor ZSRS ---
class ActorUnkZSRS : public Actor_Derived1 {
public:
/* 000 (base) */
/* 120 */ UnkStruct_ov031_02113d14 mUnk_0120;
/* 140 */
ActorUnkZSRS();
// data_ov031_02113944
};
class ActorProfileUnkZSRS : public ActorProfile_Derived2 {
public:
/* 00 (base) */
ActorProfileUnkZSRS();
/* 0C */ virtual Actor *Create();
static ActorProfileUnkZSRS *GetProfile();
};