Files
st/include/Actor/ActorRollingStone.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

152 lines
4.2 KiB
C++

#pragma once
#include "Actor/Actor.hpp"
#include "Actor/ActorProfile.hpp"
#include "ActorItemBoomerang.hpp"
#include "ActorShotArrow.hpp"
#include "Actor_Derived1.hpp"
#include "Render/ModelRender.hpp"
#include "Unknown/UnkStruct_ov031_Items.hpp"
#include "global.h"
#include "types.h"
enum ActorRollingStoneState_ {
ActorRollingStoneState_0 = 0,
ActorRollingStoneState_1 = 1,
ActorRollingStoneState_2 = 2,
ActorRollingStoneState_3 = 3,
ActorRollingStoneState_4 = 4,
ActorRollingStoneState_5 = 5,
ActorRollingStoneState_6 = 6,
ActorRollingStoneState_7 = 7,
ActorRollingStoneState_8 = 8,
ActorRollingStoneState_9 = 9,
ActorRollingStoneState_10 = 10,
ActorRollingStoneState_MAX
};
class ActorRollingStone;
class ActorRollingStone_104 : public UnkStruct_ov031_Items_00 {
public:
/* 00 (vtable) */
/* 04 */
// data_ov031_02114a5c
/* 0C */ virtual bool vfunc_0C(const UnkStruct_ov031_020e54d4 *param1, unk32 param2,
unk32 param3) override; // func_ov031_020f8354
/* 10 */ virtual void vfunc_10() override; // func_ov031_020f83e4
/* 14 */
};
class ActorRollingStone_D4 : public UnkStruct_ov031_Items_01 {
public:
/* 00 (vtable) */
/* 2C */ ActorRollingStone *mUnk_2C;
/* 30 */
ActorRollingStone_D4(ActorRollingStone *param1) {
this->mUnk_2C = param1;
}
// data_ov031_02114a40
/* 10 */ virtual void vfunc_10(Actor *param1) override; // func_ov031_020f849c
};
class ActorRollingStone : public Actor {
public:
/* 000 (base) */
/* 094 */ UnkSystem6_Derived2 mUnk_94;
/* 09C */ unk8 mUnk_9C;
/* 09D */ STRUCT_PAD(0x9D, 0xA0);
/* 0A0 */ Actor_Derived1_94 mUnk_A0;
/* 0AC */ ActorShotArrow_140 mUnk_AC;
/* 0D4 */ ActorRollingStone_D4 mUnk_D4;
/* 104 */ ActorRollingStone_104 mUnk_104;
/* 108 */ u16 mUnk_108;
/* 10A */ STRUCT_PAD(0x10A, 0x10C);
/* 10C */ Mat3p mUnk_10C;
/* 130 */ UnkStruct_PlayerGet_ec mUnk_130[0x2];
/* 138 */ unk16 mUnk_138;
/* 13C */ Cylinder mUnk_13C;
/* 14C */ unk32 mUnk_14C;
/* 150 */ volatile u16 mUnk_150;
/* 152 */ volatile u16 mUnk_152;
/* 154 */ volatile u16 mUnk_154;
/* 156 */ volatile u16 mUnk_156;
/* 158 */ bool mUnk_158;
/* 159 */ bool mUnk_159;
/* 15A */ s8 mUnk_15A;
/* 15B */ s8 mUnk_15B;
/* 15C */ Actor_Derived1_EC mUnk_15C;
/* 17C */
ActorRollingStone();
/* 18 */ virtual bool vfunc_18(unk32 param1) override; // func_ov031_020f869c
/* 20 */ virtual void vfunc_20() override; // func_ov031_020f878c
/* 2C */ virtual void vfunc_2C(unk32 param1) override; // func_ov031_020f8948
/* 54 */
bool IsInternalTimerOut1() {
if (this->mUnk_150 < this->mUnk_152) {
this->mUnk_150++;
return false;
}
return true;
}
bool IsInternalTimerOut2() {
if (this->mUnk_154 < this->mUnk_156) {
this->mUnk_154++;
return false;
}
return true;
}
void SetState(ActorState state);
void func_ov031_020f8880();
void func_ov031_020f89f4();
void func_ov031_020f8a04();
void func_ov031_020f8a2c();
void func_ov031_020f8a38();
void func_ov031_020f8a3c();
void func_ov031_020f8a58();
void func_ov031_020f8b58();
void func_ov031_020f8bc4();
void func_ov031_020f8de8();
void func_ov031_020f8ed4();
void func_ov031_020f8f0c();
void func_ov031_020f8f10();
void func_ov031_020f8f30();
void func_ov031_020f9018();
void func_ov031_020f9050();
void func_ov031_020f916c();
void func_ov031_020f91ac();
void func_ov031_020f9250();
void func_ov031_020f92cc();
void func_ov031_020f9340();
void func_ov031_020f93bc();
void func_ov031_020f9494();
void func_ov031_020f9554();
void func_ov031_020f97cc();
void func_ov031_020f98e4();
void func_ov031_020f9af4();
void func_ov031_020f9af8();
bool func_ov031_020f9ba4();
void func_ov031_020f9cc0();
};
class ActorProfileRollingStone : public ActorProfile_Derived1 {
public:
/* 00 (base) */
ActorProfileRollingStone();
/* 0C */ virtual Actor *Create();
static ActorProfileRollingStone *GetProfile();
};