mirror of
https://github.com/zeldaret/st
synced 2026-08-23 15:12:15 -04:00
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>
This commit is contained in:
Mityno
@@ -104,7 +104,8 @@ public:
|
||||
/* 20 */
|
||||
|
||||
/* 00 */ virtual void vfunc_00(); // corresponds to func_ov000_02097c14
|
||||
/* 04 */ virtual void vfunc_04(); // corresponds to func_ov000_02097c20
|
||||
/* 04 */ virtual unk32 vfunc_04(ActorRef param1, unk32 param2, unk32 param3,
|
||||
unk32 *param4) override; // corresponds to func_ov000_02097c20
|
||||
/* 08 */
|
||||
|
||||
Actor_9C();
|
||||
@@ -134,8 +135,8 @@ public:
|
||||
/* 10 */ VecFx32 mPrevPos;
|
||||
/* 1C */ VecFx32 mVel;
|
||||
/* 28 */ union {
|
||||
s16 mAngle;
|
||||
UnkAngleStruct mAngleStruct;
|
||||
/* 28 */ fx16 mAngle;
|
||||
/* 28 */ UnkAngleStruct mAngleStruct;
|
||||
};
|
||||
/* 2A */ unk16 mUnk_2A;
|
||||
/* 2C */ unk32 mUnk_2C; // gravity?
|
||||
@@ -226,7 +227,7 @@ public:
|
||||
u32 func_ov000_02098800(bool param1);
|
||||
bool func_ov000_02098838();
|
||||
unk32 func_ov000_02098910(UnkStruct_ov031_Items_00 *param1, unk32 param2);
|
||||
void func_ov000_02098b8c(unk32 param1, unk32 param2);
|
||||
void func_ov000_02098b8c(unk32 param1, void *param2);
|
||||
s32 func_ov000_02098518(unk32 *param1);
|
||||
VecFx32 *func_ov000_0209853c(unk32 param1);
|
||||
s32 func_ov000_02098554();
|
||||
@@ -304,7 +305,7 @@ public:
|
||||
|
||||
/* 30 */ virtual void vfunc_30(Actor_vfunc_30 *param1);
|
||||
/* 4C */ WEAK virtual ~Actor_Derived2() {}
|
||||
/* 54 */ virtual void vfunc_54();
|
||||
/* 54 */ virtual void vfunc_54(unk32 param1);
|
||||
};
|
||||
|
||||
extern UnkStruct_ov000_020b539c data_ov000_020b539c_eur;
|
||||
|
||||
@@ -36,7 +36,7 @@ public:
|
||||
|
||||
/* 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) override;
|
||||
/* 0C */ virtual bool vfunc_0C(const UnkStruct_ov031_020e54d4 *param1, unk32 param2, unk32 param3) override;
|
||||
};
|
||||
|
||||
class ActorItemBoomerang_A0 : public UnkStruct_ov031_Items_01 {
|
||||
|
||||
@@ -36,7 +36,7 @@ public:
|
||||
~ActorProfile();
|
||||
|
||||
/* 00 */ virtual Actor *Create() = 0;
|
||||
/* 04 */ virtual void vfunc_04();
|
||||
/* 04 */ virtual unk32 vfunc_04();
|
||||
/* 08 */ virtual void vfunc_08();
|
||||
/* 0C */ virtual void vfunc_0C();
|
||||
/* 10 */ virtual void vfunc_10();
|
||||
@@ -59,7 +59,7 @@ public:
|
||||
ActorProfile_Derived1(ActorId actorId1, ActorId actorId2);
|
||||
~ActorProfile_Derived1();
|
||||
|
||||
/* 04 */ virtual void vfunc_04() override;
|
||||
/* 04 */ virtual unk32 vfunc_04() override;
|
||||
/* 10 */ virtual void vfunc_10() override;
|
||||
/* 14 */ virtual void vfunc_14() override;
|
||||
/* 18 */ virtual void vfunc_18() override;
|
||||
@@ -73,10 +73,10 @@ public:
|
||||
ActorProfile_Derived2(ActorId actorId1, ActorId actorId2) :
|
||||
ActorProfile_Derived1(actorId1, actorId2) {}
|
||||
|
||||
/* 04 */ virtual void 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
|
||||
/* 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)();
|
||||
|
||||
@@ -33,8 +33,9 @@ public:
|
||||
/* 04 */
|
||||
|
||||
// data_ov031_02114a5c
|
||||
/* 0C */ virtual bool vfunc_0C(const UnkStruct_ov031_020e54d4 *param1, unk32 param2) override; // func_ov031_020f8354
|
||||
/* 10 */ virtual void vfunc_10() override; // func_ov031_020f83e4
|
||||
/* 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 */
|
||||
};
|
||||
|
||||
|
||||
@@ -50,7 +50,7 @@ public:
|
||||
// data_ov031_02114288
|
||||
/* 00 */ virtual ~ActorShotArrow_178() override;
|
||||
/* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1) override;
|
||||
/* 0C */ virtual bool vfunc_0C(const UnkStruct_ov031_020e54d4 *param1, unk32 param2) override;
|
||||
/* 0C */ virtual bool vfunc_0C(const UnkStruct_ov031_020e54d4 *param1, unk32 param2, unk32 param3) override;
|
||||
|
||||
void func_ov031_020f3304();
|
||||
};
|
||||
|
||||
+159
-43
@@ -1,44 +1,170 @@
|
||||
//! TODO: This file was generated automatically and might contain errors
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "Actor/Actor.hpp"
|
||||
#include "Actor/ActorProfile.hpp"
|
||||
#include "Actor/ActorUnkCASE.hpp"
|
||||
#include "Actor/ActorUnkZLSL_ZSRS.hpp"
|
||||
#include "Actor/Actor_Derived1.hpp"
|
||||
#include "Physics/Cylinder.hpp"
|
||||
#include "Render/ModelRender.hpp"
|
||||
#include "Unknown/UnkStruct_ov031_Items.hpp"
|
||||
#include "global.h"
|
||||
#include "nitro/fx.h"
|
||||
#include "nitro/types.h"
|
||||
#include "nns/g3d/g3d.h"
|
||||
#include "types.h"
|
||||
|
||||
class ActorUnkCANS_C4 : public Actor_C4 {
|
||||
public:
|
||||
ActorUnkCANS_C4(Actor *param1);
|
||||
|
||||
/* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override;
|
||||
/* 04 */ virtual bool vfunc_04() override;
|
||||
/* 08 */ virtual void vfunc_08() override;
|
||||
/* 0C */ virtual void vfunc_0C(unk32 param1) override;
|
||||
// Try to match vfunc_0C but poor results
|
||||
struct UnkStruct_02162ea8_vfunc_0C {
|
||||
/* 00 */ union {
|
||||
unk32 mUnk_00;
|
||||
Vec2bCpp vec;
|
||||
};
|
||||
/* 04 */ union {
|
||||
unk32 mUnk_04;
|
||||
struct {
|
||||
u8 mUnk_04_0;
|
||||
u8 mUnk_04_1;
|
||||
u8 mUnk_04_2;
|
||||
u8 mUnk_04_3;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
class ActorUnkCANS : public Actor {
|
||||
class UnkStruct_ov063_02162ea8 : public UnkStruct_ov031_Items_00 {
|
||||
public:
|
||||
/* 00 (base) */
|
||||
/* 94 */
|
||||
/* 04 */ STRUCT_PAD(0x4, 0x8);
|
||||
/* 08 */ VecFx32 mUnk_08;
|
||||
/* 14 */
|
||||
|
||||
UnkStruct_ov063_02162ea8();
|
||||
|
||||
/* 00 (base) */ virtual ~UnkStruct_ov063_02162ea8();
|
||||
/* 08 */ virtual bool vfunc_08(UnkStruct_ov031_020f3310 *param1) override;
|
||||
/* 0C */ virtual bool vfunc_0C(const UnkStruct_ov031_020e54d4 *param1, unk32 param2, unk32 param3) override;
|
||||
};
|
||||
|
||||
class UnkStruct_ov000_020b19f0 : public ModelRender {
|
||||
public:
|
||||
UnkStruct_ov000_020b19f0(G3d_Model *pModel);
|
||||
};
|
||||
|
||||
class UnkStruct_ov000_020b3268 : public UnkStruct_ov000_020b19f0 {
|
||||
public:
|
||||
UnkStruct_ov000_020b3268(G3d_Model *pModel);
|
||||
};
|
||||
|
||||
class UnkStruct_ov063_02162ee8 : public UnkStruct_ov000_020b3268 {
|
||||
public:
|
||||
/* 00 (base) */
|
||||
/* 60 */ STRUCT_PAD(0x60, 0x6C);
|
||||
/* 6C */ unk32 mUnk_6C;
|
||||
/* 70 */ unk32 mUnk_70;
|
||||
/* 74 */ unk32 mUnk_74;
|
||||
/* 78 */
|
||||
|
||||
UnkStruct_ov063_02162ee8(G3d_Model *pModel);
|
||||
};
|
||||
|
||||
class UnkStruct_ov063_02162f14 : public UnkStruct_ov000_020b31f0 {
|
||||
public:
|
||||
/* 2C */
|
||||
/* 2C */ UnkSystem5 mUnk_2C;
|
||||
/* 4C */ unk32 mUnk_4C;
|
||||
/* 50 */ STRUCT_PAD(0x50, 0x7C);
|
||||
/* 7C */ UnkSystem5 mUnk_7C;
|
||||
/* 9C */ unk32 mUnk_9C;
|
||||
|
||||
UnkStruct_ov063_02162f14(void *param3, unk32 param4) :
|
||||
UnkStruct_ov000_020b31f0(&mUnk_2C, &mUnk_7C, param3, param4),
|
||||
mUnk_2C(&mUnk_4C, NULL),
|
||||
mUnk_7C(&mUnk_9C, NULL) {
|
||||
if (param4 != 0) {
|
||||
*(unk32 *) &mUnk_7C = mUnk_10;
|
||||
*(unk32 *) &mUnk_2C = mUnk_10;
|
||||
}
|
||||
}
|
||||
|
||||
/* 38 */ virtual void vfunc_38(unk32 param1, unk32 param2) override;
|
||||
/* 3C */ virtual void vfunc_3C(void) override;
|
||||
};
|
||||
|
||||
class UnkStruct_ov063_02162e88 : public Actor_9C {
|
||||
public:
|
||||
/* 20 */ void *mUnk_20; // ActorUnkCANS*
|
||||
/* 24 */
|
||||
|
||||
UnkStruct_ov063_02162e88(void *param1);
|
||||
|
||||
/* 04 */ virtual unk32 vfunc_04(ActorRef param1, unk32 param2, unk32 param3, unk32 *param4) override;
|
||||
};
|
||||
|
||||
class UnkStruct_func_ov063_0215a678 {
|
||||
public:
|
||||
/* 00 */ STRUCT_PAD(0x00, 0x04);
|
||||
/* 04 */ ModelRender *mUnk_04; //! INFO: Placeholder that matches
|
||||
/* 08 */ unk32 mUnk_08;
|
||||
/* 0C */ STRUCT_PAD(0x0C, 0x92);
|
||||
/* 92 */ s8 mUnk_92;
|
||||
/* 93 */ STRUCT_PAD(0x93, 0xAE);
|
||||
/* AE */ u8 mUnk_AE;
|
||||
};
|
||||
|
||||
class UnkStruct_ActorUnkCANS_224 {
|
||||
public:
|
||||
/* 00 (base) */
|
||||
/* 04 */
|
||||
|
||||
UnkStruct_ActorUnkCANS_224(); // func_ov000_02099820
|
||||
};
|
||||
|
||||
class ActorUnkCANS : public Actor_Derived2 {
|
||||
public:
|
||||
/* 000 (base) */
|
||||
/* 0AE */ STRUCT_PAD(0xAE, 0xB0);
|
||||
/* 0B0 */ UnkStruct_ov063_02162ee8 mUnk_B0;
|
||||
/* 128 */ UnkStruct_ov063_02162f14 mUnk_128;
|
||||
/* 1C8 */ STRUCT_PAD(0x1C8, 0x1F4);
|
||||
/* 1F4 */ Actor_Derived1_94 mUnk_1F4;
|
||||
/* 200 */ UnkStruct_ov063_02162e88 mUnk_200;
|
||||
/* 224 */ UnkStruct_ActorUnkCANS_224 mUnk_224;
|
||||
/* 226 */ STRUCT_PAD(0x226, 0x22C);
|
||||
/* 22C */ unk16 mUnk_22C;
|
||||
/* 22E */ unk16 mUnk_22E;
|
||||
/* 230 */ STRUCT_PAD(0x230, 0x234);
|
||||
/* 234 */ volatile u16 mUnk_234;
|
||||
/* 236 */ u16 mUnk_236;
|
||||
/* 238 */ volatile u16 mUnk_238;
|
||||
/* 23A */ u16 mUnk_23A;
|
||||
/* 23C */ UnkStruct_ov063_02162ea8 mUnk_23C;
|
||||
/* 250 */ VecFx32 mUnk_250;
|
||||
/* 25C */ unk32 mUnk_25C;
|
||||
/* 260 */ unk32 mUnk_260;
|
||||
/* 264 */ unk32 mUnk_264;
|
||||
/* 268 */ ActorUnkCASE *mUnk_268;
|
||||
/* 26C */ fx16 mUnk_26C; // Some kind of angle, probably
|
||||
/* 26E */ STRUCT_PAD(0x26E, 0x270);
|
||||
/* 270 */ unk32 mUnk_270;
|
||||
/* 274 */ u16 mUnk_274;
|
||||
/* 276 */ s8 mUnk_276;
|
||||
/* 277 */ s8 mUnk_277;
|
||||
/* 278 */
|
||||
|
||||
ActorUnkCANS();
|
||||
|
||||
/* 10 */ virtual void vfunc_10(Cylinder *param1);
|
||||
/* 18 */ virtual unk32 vfunc_18(void);
|
||||
/* 1C */ virtual void vfunc_1C(void);
|
||||
/* 20 */ virtual void vfunc_20(void);
|
||||
/* 24 */ virtual void vfunc_24(void);
|
||||
/* 2C */ virtual void vfunc_2C(unk32 param1);
|
||||
/* 4C */ virtual ~ActorUnkCANS() override;
|
||||
|
||||
void func_ov063_02157f20(void);
|
||||
void func_ov063_02157f7c(void);
|
||||
void func_ov063_02157fa4(void);
|
||||
void func_ov063_021582f8(void);
|
||||
void func_ov063_0215830c(void);
|
||||
void func_ov063_02158320(void);
|
||||
void func_ov063_02158388(void);
|
||||
unk32 func_ov063_02157fa4(ActorRef param1, unk32 param2, unk32 param3, unk32 *param4);
|
||||
void func_ov063_02158424(void);
|
||||
void func_ov063_02158448(void);
|
||||
void func_ov063_02158448(unk32 param1);
|
||||
void func_ov063_02158490(void);
|
||||
void func_ov063_021584c4(void);
|
||||
void func_ov063_021584f0(void);
|
||||
void func_ov063_02158a2c(void);
|
||||
void func_ov063_02158b0c(void);
|
||||
void func_ov063_02158b34(void);
|
||||
void func_ov063_02158b98(void);
|
||||
@@ -62,27 +188,17 @@ public:
|
||||
void func_ov063_02159e1c(void);
|
||||
void func_ov063_02159e20(void);
|
||||
void func_ov063_02159ec0(void);
|
||||
void func_ov063_02159f3c(void);
|
||||
void func_ov063_0215a0f0(void);
|
||||
void func_ov063_0215a2c0(void);
|
||||
unk32 func_ov063_02159f3c(unk32 param1);
|
||||
unk32 func_ov063_0215a0f0(void);
|
||||
unk32 func_ov063_0215a2c0(void);
|
||||
void func_ov063_0215a428(void);
|
||||
void func_ov063_0215a474(void);
|
||||
void func_ov063_0215a514(void);
|
||||
void func_ov063_0215a56c(void);
|
||||
void func_ov063_0215a5a0(void);
|
||||
void func_ov063_0215a5bc(void);
|
||||
void func_ov063_0215a5d8(void);
|
||||
void func_ov063_0215a5f8(void);
|
||||
void func_ov063_0215a678(void);
|
||||
void func_ov063_0215a7d4(void);
|
||||
void func_ov063_0215a834(void);
|
||||
void func_ov063_0215a880(void);
|
||||
void func_ov063_0215a94c(void);
|
||||
void func_ov063_0215a970(void);
|
||||
void func_ov063_0215a99c(void);
|
||||
void func_ov063_0215a9b8(void);
|
||||
void func_ov063_0215a9d4(void);
|
||||
void func_ov063_0215aa58(void);
|
||||
unk32 func_ov063_0215a474(void);
|
||||
unk32 func_ov063_0215a514(void);
|
||||
unk32 func_ov063_0215a56c(unk32 param1);
|
||||
void func_ov063_0215a5a0(VecFx32 *param1);
|
||||
unk32 func_ov063_0215a5bc(void);
|
||||
unk32 func_ov063_0215a5d8(void);
|
||||
static void func_ov063_0215a678(ActorUnkCANS *param1, UnkStruct_func_ov063_0215a678 *param2);
|
||||
};
|
||||
|
||||
class ActorProfileUnkCANS : public ActorProfile_Derived1 {
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
|
||||
#include "Actor/Actor.hpp"
|
||||
#include "Actor/ActorProfile.hpp"
|
||||
#include "Actor/ActorRef.hpp"
|
||||
#include "global.h"
|
||||
#include "types.h"
|
||||
|
||||
@@ -33,7 +34,7 @@ public:
|
||||
void func_ov063_0215ac68(void);
|
||||
void func_ov063_0215ac8c(void);
|
||||
void func_ov063_0215acc8(void);
|
||||
void func_ov063_0215acec(void);
|
||||
static void func_ov063_0215acec(ActorRef *ref1, ActorRef ref2); // copy ?
|
||||
void func_ov063_0215ae6c(void);
|
||||
void func_ov063_0215ae80(void);
|
||||
void func_ov063_0215ae94(void);
|
||||
@@ -53,7 +54,7 @@ public:
|
||||
void func_ov063_0215b2c8(void);
|
||||
void func_ov063_0215b2ec(void);
|
||||
void func_ov063_0215b624(void);
|
||||
void func_ov063_0215b6c8(void);
|
||||
void func_ov063_0215b6c8(VecFx32 *param1, UnkAngleStruct angle);
|
||||
void func_ov063_0215b724(void);
|
||||
void func_ov063_0215b7cc(void);
|
||||
void func_ov063_0215b814(void);
|
||||
|
||||
@@ -3,10 +3,13 @@
|
||||
#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
|
||||
@@ -42,7 +45,16 @@ public:
|
||||
class UnkStruct_ov000_020b31a8 {
|
||||
public:
|
||||
/* 00 (vtable) */
|
||||
/* 04 */
|
||||
/* 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();
|
||||
@@ -54,7 +66,7 @@ public:
|
||||
/* 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 void vfunc_28();
|
||||
/* 28 */ virtual UnkStruct_PlayerGet_50 *vfunc_28();
|
||||
/* 2C */ virtual void vfunc_2C();
|
||||
/* 30 */ virtual s8 vfunc_30();
|
||||
/* 34 */ virtual void vfunc_34();
|
||||
@@ -65,11 +77,9 @@ public:
|
||||
class ActorUnkZLSL_27CC : public UnkStruct_ov000_020b31a8 {
|
||||
public:
|
||||
/* 00 (base) */
|
||||
/* 04 */ unk32 mUnk_04;
|
||||
/* 08 */ ModelRender *mUnk_08;
|
||||
/* 0C */ STRUCT_PAD(0x0C, 0x18);
|
||||
/* 18 */ s8 mUnk_18;
|
||||
/* 19 */
|
||||
/* 1C */
|
||||
|
||||
ActorUnkZLSL_27CC();
|
||||
|
||||
// data_ov031_0211369c
|
||||
/* 30 */ virtual s8 vfunc_30() override;
|
||||
@@ -90,7 +100,15 @@ public:
|
||||
class UnkStruct_ov000_020b31f0 : public UnkStruct_ov000_020b31a8 {
|
||||
public:
|
||||
/* 00 (vtable) */
|
||||
/* 04 */
|
||||
/* 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;
|
||||
@@ -98,9 +116,9 @@ public:
|
||||
/* 0C */ virtual void vfunc_0C() override;
|
||||
/* 10 */ virtual UnkSystem5 *vfunc_10() override;
|
||||
/* 14 */ virtual void vfunc_14() override;
|
||||
/* 1C */ virtual void vfunc_1C(char param1[], unk32 param2, unk32 param3, unk32 param4) override;
|
||||
/* 1C */ virtual void vfunc_1C(ActorUnkZLSL_AnimationTag param1, unk32 param2, unk32 param3, unk32 param4) override;
|
||||
/* 20 */ virtual void vfunc_20() override;
|
||||
/* 28 */ virtual void vfunc_28() 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;
|
||||
@@ -118,6 +136,8 @@ public:
|
||||
/* 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;
|
||||
@@ -130,6 +150,8 @@ public:
|
||||
/* 00 (base) */
|
||||
/* 20 */
|
||||
|
||||
UnkStruct_ov031_02113d14();
|
||||
|
||||
// data_ov031_02113d14
|
||||
/* 00 */ virtual ~UnkStruct_ov031_02113d14();
|
||||
};
|
||||
|
||||
@@ -214,7 +214,7 @@ public:
|
||||
void func_ov000_020a9a94();
|
||||
void func_ov000_020a9abc();
|
||||
|
||||
static void func_ov000_020a9804();
|
||||
static void func_ov000_020a9804(void *param1, unk32 param2);
|
||||
|
||||
// overlay 1
|
||||
void func_ov001_020bff2c();
|
||||
|
||||
@@ -313,10 +313,6 @@ struct UnkStruct_func_ov000_020830d4 {
|
||||
u32 mUnk_0C;
|
||||
};
|
||||
|
||||
struct UnkStruct_func_ov001_020bbe18 {
|
||||
u16 mUnk_00;
|
||||
};
|
||||
|
||||
class PlayerActorBase_70 {
|
||||
private:
|
||||
/* 000 */ BOOL mIsNotLink;
|
||||
@@ -364,10 +360,10 @@ public:
|
||||
|
||||
// overlay 0
|
||||
void func_ov000_02082e78(unk32 param1, unk32 param2, unk32 param3, unk32 param4);
|
||||
void func_ov000_020830d4(UnkStruct_func_ov001_020bbe18 param1, u32 param2, u8 param3, unk32 param4);
|
||||
void func_ov000_020830d4(UnkAngleStruct param1, u32 param2, u8 param3, unk32 param4);
|
||||
|
||||
// overlay 1
|
||||
void func_ov001_020bbe18(unk32 param1, UnkStruct_func_ov001_020bbe18 param2, u32 param3, u8 param4);
|
||||
void func_ov001_020bbe18(unk32 param1, UnkAngleStruct param2, u32 param3, u8 param4);
|
||||
};
|
||||
|
||||
class PlayerActorBase_74 {
|
||||
@@ -432,7 +428,7 @@ public:
|
||||
/* 24 */ VecFx32 mAccel;
|
||||
/* 30 */ union {
|
||||
u16 mAngle;
|
||||
UnkStruct_func_ov001_020bbe18 mAngleStruct;
|
||||
UnkAngleStruct mAngleStruct;
|
||||
};
|
||||
/* 32 */ u8 mInvincibilityTimer;
|
||||
/* 33 */ u8 mInvincibilityIconTimer; // the blinking icon on top-screen
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
#pragma once
|
||||
|
||||
#include "global.h"
|
||||
#include "math.hpp"
|
||||
#include "nitro/fx.h"
|
||||
#include "profile.hpp"
|
||||
#include "types.h"
|
||||
|
||||
#include <nns/g3d/g3d.h>
|
||||
@@ -9,7 +11,7 @@
|
||||
class UnkSystem5;
|
||||
extern "C" void *func_ov000_02057750(size_t allocSize);
|
||||
|
||||
typedef void (*UnkSystem4_UnkCallback)(void);
|
||||
typedef void (*UnkSystem4_UnkCallback)(void *, unk32);
|
||||
|
||||
class UnkSystem4_vfunc_1C_B4 {
|
||||
public:
|
||||
@@ -109,7 +111,7 @@ public:
|
||||
/* 00 */ virtual ~UnkSystem6_Derived2() {}
|
||||
/* 0C */ virtual void vfunc_0C() override;
|
||||
|
||||
void func_01ffc6d4(u16 angle, VecFx32 *pos);
|
||||
void func_01ffc6d4(UnkAngleStruct angleStruct, VecFx32 *pos);
|
||||
};
|
||||
|
||||
class ModelRender_ov000_020b198c : public ModelRenderBase {
|
||||
|
||||
@@ -289,7 +289,8 @@ public:
|
||||
|
||||
class UnkStruct_ov031_020e54d4 {
|
||||
public:
|
||||
/* 00 */ STRUCT_PAD(0x00, 0x08);
|
||||
/* 00 */ STRUCT_PAD(0x00, 0x04);
|
||||
/* 04 */ unk32 mUnk_04;
|
||||
/* 08 */ u32 mUnk_08;
|
||||
};
|
||||
|
||||
@@ -301,7 +302,7 @@ public:
|
||||
// data_ov000_020b2838
|
||||
/* 00 */ virtual ~UnkStruct_027e0ce0_38_Base();
|
||||
/* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1);
|
||||
/* 0C */ virtual bool vfunc_0C(const UnkStruct_ov031_020e54d4 *param1, unk32 param2);
|
||||
/* 0C */ virtual bool vfunc_0C(const UnkStruct_ov031_020e54d4 *param1, unk32 param2, unk32 param3);
|
||||
/* 10 */ virtual void vfunc_10();
|
||||
/* 14 */
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user