mirror of
https://github.com/zeldaret/st
synced 2026-08-05 09:34:10 -04:00
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>
110 lines
2.9 KiB
C++
110 lines
2.9 KiB
C++
#pragma once
|
|
|
|
#include "Actor/Actor.hpp"
|
|
#include "Actor/ActorProfile.hpp"
|
|
#include "Render/ModelRender.hpp"
|
|
#include "Unknown/UnkStruct_ov031_Items.hpp"
|
|
#include "global.h"
|
|
#include "types.h"
|
|
|
|
enum ActorItemBoomerangState_ {
|
|
ActorItemBoomerangState_0,
|
|
ActorItemBoomerangState_1,
|
|
ActorItemBoomerangState_MAX
|
|
};
|
|
|
|
class ActorItemBoomerang;
|
|
|
|
class ActorItemBoomerang_Unknown { // inherits from UnkStruct_PlayerGet_ec ?
|
|
public:
|
|
/* 00 */ unk32 mUnk_00;
|
|
/* 04 */ VecFx32 mUnk_04;
|
|
/* 10 */
|
|
|
|
void func_ov031_020e45fc();
|
|
void func_ov031_020e5704();
|
|
};
|
|
|
|
class ActorItemBoomerang_11C : public UnkStruct_ov031_Items_00 {
|
|
public:
|
|
/* 00 (vtable) */
|
|
/* 04 */ STRUCT_PAD(0x04, 0x08);
|
|
/* 08 */ ActorItemBoomerang *mUnk_08;
|
|
/* 0C */
|
|
|
|
ActorItemBoomerang_11C(ActorItemBoomerang *param1);
|
|
|
|
/* 00 */ virtual ~ActorItemBoomerang_11C() override;
|
|
/* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1) override;
|
|
/* 0C */ virtual bool vfunc_0C(const UnkStruct_ov031_020e54d4 *param1, unk32 param2, unk32 param3) override;
|
|
};
|
|
|
|
class ActorItemBoomerang_A0 : public UnkStruct_ov031_Items_01 {
|
|
public:
|
|
/* 00 (vtable) */
|
|
/* 04 */
|
|
|
|
/* 10 */ virtual void vfunc_10(Actor *actor) override;
|
|
};
|
|
|
|
class ActorItemBoomerang_CC : public UnkStruct_ov031_Items_01 {
|
|
public:
|
|
/* 00 (vtable) */
|
|
/* 2C */ unk32 mUnk_2C;
|
|
/* 30 */ ActorItemBoomerang_Unknown mUnk_30;
|
|
/* 40 */
|
|
|
|
ActorItemBoomerang_CC() :
|
|
mUnk_2C(0x0) {}
|
|
|
|
/* 0C */ virtual bool vfunc_0C(Actor *actor, VecFx32 *param2) override;
|
|
/* 10 */ virtual void vfunc_10(Actor *actor) override;
|
|
};
|
|
|
|
class ActorItemBoomerang : public Actor {
|
|
public:
|
|
/* 000 (base) */
|
|
/* 094 */ UnkSystem6_Derived2 mUnk_94;
|
|
/* 09C */ bool mUnk_9C;
|
|
/* 09D */ STRUCT_PAD(0x9D, 0xA0);
|
|
/* 0A0 */ ActorItemBoomerang_A0 mUnk_A0;
|
|
/* 0CC */ ActorItemBoomerang_CC mUnk_CC;
|
|
/* 10C */ VecFx32 mUnk_10C;
|
|
/* 118 */ unk32 mUnk_118;
|
|
/* 11C */ ActorItemBoomerang_11C mUnk_11C;
|
|
/* 128 */ u32 mUnk_128;
|
|
/* 12C */ UnkStruct_PlayerGet_ec mUnk_12C[0x3];
|
|
/* 138 */ u16 mUnk_138; // timer ?
|
|
/* 13A */ u16 mUnk_13A;
|
|
/* 13C */ u16 mUnk_13C;
|
|
/* 13E */ STRUCT_PAD(0x13E, 0x140);
|
|
/* 140 */ UnkStruct_ov031_Items_02 mUnk_140;
|
|
/* 14C */ STRUCT_PAD(0x14C, 0x188);
|
|
/* 188 */
|
|
|
|
ActorItemBoomerang();
|
|
|
|
/* 18 */ virtual bool vfunc_18(unk32 param1) override;
|
|
/* 20 */ virtual void vfunc_20() override;
|
|
/* 2C */ virtual void vfunc_2C(unk32 param1) override;
|
|
/* 4C */ virtual ~ActorItemBoomerang() override;
|
|
|
|
void SetState(ActorState state);
|
|
void func_ov031_020e49b0(unk32 param1);
|
|
void func_ov031_020e5034(unk32 param1);
|
|
void func_ov031_020e5220();
|
|
void func_ov031_020e52a0();
|
|
};
|
|
|
|
class ActorProfileItemBoomerang : public ActorProfile {
|
|
public:
|
|
/* 00 (base) */
|
|
|
|
ActorProfileItemBoomerang();
|
|
~ActorProfileItemBoomerang();
|
|
|
|
/* 0C */ virtual Actor *Create();
|
|
|
|
static ActorProfileItemBoomerang *GetProfile();
|
|
};
|