mirror of
https://github.com/zeldaret/st
synced 2026-08-05 09:34:10 -04:00
Mityno
7c266293a7
* 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>
83 lines
2.2 KiB
C++
83 lines
2.2 KiB
C++
#pragma once
|
|
|
|
#include "Actor/ActorId.hpp"
|
|
#include "Physics/Cylinder.hpp"
|
|
#include "System/SysNew.hpp"
|
|
#include "Unknown/Common.hpp"
|
|
#include "profile.hpp"
|
|
#include "types.h"
|
|
|
|
class Actor;
|
|
|
|
class ActorProfile {
|
|
public:
|
|
/* 00 (vtable) */
|
|
/* 04 */ Cylinder mUnk_04;
|
|
/* 14 */ unk8 mUnk_14;
|
|
/* 15 */ bool mUnk_15;
|
|
/* 16 */ unk8 mUnk_16;
|
|
/* 17 */ unk8 mUnk_17;
|
|
/* 18 */ unk8 mUnk_18;
|
|
/* 19 */ unk8 mUnk_19;
|
|
/* 1A */ unk16 mUnk_1A;
|
|
/* 1C */ unk16 mUnk_1C;
|
|
/* 1E */ u16 mUnk_1E;
|
|
/* 20 */ ActorId mActorId;
|
|
/* 24 */ unk32 mUnk_24;
|
|
/* 28 */ unk32 mUnk_28;
|
|
/* 2C */ unk32 mUnk_2C;
|
|
/* 30 */ unk32 mUnk_30;
|
|
/* 34 */ unk32 mUnk_34;
|
|
/* 38 */ u8 mUnk_38;
|
|
/* 39 */ unk8 mUnk_39;
|
|
/* 3A */
|
|
|
|
ActorProfile(ActorId actorId);
|
|
~ActorProfile();
|
|
|
|
/* 00 */ virtual Actor *Create() = 0;
|
|
/* 04 */ virtual unk32 vfunc_04();
|
|
/* 08 */ virtual void vfunc_08();
|
|
/* 0C */ virtual void vfunc_0C();
|
|
/* 10 */ virtual void vfunc_10();
|
|
/* 14 */ virtual void vfunc_14();
|
|
/* 18 */ virtual void vfunc_18();
|
|
/* 1C */
|
|
|
|
void func_ov000_020977e4();
|
|
void func_ov000_020975dc();
|
|
};
|
|
|
|
class ActorProfile_Derived1 : public ActorProfile {
|
|
public:
|
|
/* 00 (base) */
|
|
/* 3C */ UnkActorFileSystem2 mUnk_3C;
|
|
/* D4 */ unk32 mUnk_D4;
|
|
/* D8 */
|
|
|
|
ActorProfile_Derived1(ActorId actorId);
|
|
ActorProfile_Derived1(ActorId actorId1, ActorId actorId2);
|
|
~ActorProfile_Derived1();
|
|
|
|
/* 04 */ virtual unk32 vfunc_04() override;
|
|
/* 10 */ virtual void vfunc_10() override;
|
|
/* 14 */ virtual void vfunc_14() override;
|
|
/* 18 */ virtual void vfunc_18() override;
|
|
};
|
|
|
|
class ActorProfile_Derived2 : public ActorProfile_Derived1 {
|
|
public:
|
|
/* 00 (base) */
|
|
/* D8 */
|
|
|
|
ActorProfile_Derived2(ActorId actorId1, ActorId actorId2) :
|
|
ActorProfile_Derived1(actorId1, actorId2) {}
|
|
|
|
/* 04 */ virtual unk32 vfunc_04() override; // func_ov000_02097944
|
|
/* 10 */ virtual void vfunc_10() override; // func_ov000_0209794c
|
|
/* 14 */ virtual void vfunc_14() override; // func_ov000_0209796c
|
|
/* 18 */ virtual void vfunc_18() override; // func_ov000_02097998
|
|
};
|
|
|
|
// typedef ActorProfile *(*GetActorProfile)();
|