mirror of
https://github.com/zeldaret/st
synced 2026-08-15 20:59:59 -04:00
Decompile ActorUnkAROW (83%) (#70)
* refactor: unknown arow actor to arrow
* refactor: rename ActorUnkArow_c4 and remove warning
* refactor: rename class in system files
* feat: match actorprofilearrow
* feat: progress decompilation
* feat: rename actor to ActorShotArrow
* feat: change mangled name
* feat: decompile some functions and mark unmatched functions as non-matching
* feat: progress
* feat: decompiling function 020f206c
* feat: change two fields for struct padding
* feat: remove non-matching comment on matched function
* feat: decompiling function 020f20bc
* refactor: fix .bss mangled names
* feat: decompiling 020f2134
* feat: decompiling func_ov031_020f2160
* feat: matching function func_ov031_020f21dc
* feat: use correct mangled names in jp version
* fix: change back arm9/delinks in eur version
* feat: non-matching function 020f1a64
* feat: decompile 020f2270
* feat: decompile function 020f2280
* feat: uncompile func_ov031_020f229c
* feat: match 020f22d4 add UnkSystem{4,5} as fields
* feat: reverse 020f2b8c
* feat: 020f2bbc
* feat: 020f2bec
* feat: 020f3304
* style: explicitly indicate floating values when using FLOAT_TO_Q20
* style: move external function to the top
* feat: begin of 020f3258
* feat: decompile 020f32c4
* feat: propagate mangled names changes to japan version
* feat: begin decompilation of func_ov031_020f370c
* feat: begin weird decompilation of func_ov031_020f3d4c
* feat: decompile function 020f3d04
* feat: better matching
* feat: matching function func_ov031_020f2214
* feat: decompile the function 020f3258
* feat: increase matched code
* feat: decompile function func_ov031_020f2794
* feat: decompile function func_ov031_020f18bc
* feat: decompile almost all func_ov031_020f195c
* feat: decompile 3/4 of func_ov031_020f173c
* refactor: change back function's return type to void
* feat: begin decompilation of func_ov031_020f1b04
* feat: advance decompilation of 020f1c7c
* feat: decompile 020f1e3c
* feat: decompile function func_ov031_020f1f54
* refactor: move func(Actor *) into ActorShotArrow class
* feat: introduce ActorShotArrow_194 thanks to Yanis002
* fix: use FX32 in macros over old Q20
* fix: praying magic behaviour
* revert: revert before build failure
* revert: remove all relocs.txt magic stuff
* revert: introduce back correct symbols
* revert: introduce back CORRECTLY correct symbols
* feat: rename vtable
* fix: wrong hex in comment
* feat: huge improvements
* fix: undefined 02081d7c
* fix: awful symbol name
* fix: part of mangled name in jp version
* fix: rest of the line disappeared
* fix: try to fix jp version
* fix: apply eur fix to jp
* feat: add function 020f374c
* fix: full match of 020f173c
* feat: move function in upperclass
* feat: change ActorRupee to use class function
* feat: try decompiling func_ov031_020f2ef0
* feat: improvements
* feat: improvements
* docs: add comment
* fix: build issues
* feat: improvements
* feat: improvements
* feat: forget inclusion of unkstruct
* feat: enhanced
* feat: some improvements
* style: better style
* feat: decompile function and cleanup
* refactor: remove .cache ??
* review
---------
Co-authored-by: Yanis002 <35189056+Yanis002@users.noreply.github.com>
This commit is contained in:
Alessevan
@@ -157,7 +157,7 @@ public:
|
||||
/* 04 */ virtual bool vfunc_04();
|
||||
/* 08 */ virtual unk16 vfunc_08();
|
||||
/* 0C */ virtual unk8 vfunc_0C();
|
||||
/* 10 */ virtual void vfunc_10();
|
||||
/* 10 */ virtual void vfunc_10(VecFx32 *param1);
|
||||
/* 14 */ virtual void vfunc_14();
|
||||
/* 18 */ virtual bool vfunc_18(unk32 param1);
|
||||
/* 1C */ virtual void vfunc_1C();
|
||||
@@ -203,6 +203,8 @@ public:
|
||||
}
|
||||
|
||||
// overlay 0
|
||||
bool func_ov000_0205cbc4(u32 param1, VecFx32 *param2);
|
||||
unk32 func_ov000_0207e294(Cylinder *param1);
|
||||
void func_ov000_0209848c(ActorProfile *param1);
|
||||
void func_ov000_020984b0();
|
||||
void func_ov000_020984b4();
|
||||
@@ -213,6 +215,7 @@ public:
|
||||
unk32 func_ov000_020984c8();
|
||||
void func_ov000_020984d0();
|
||||
void func_ov000_020984f0();
|
||||
u32 func_ov000_02098800(bool param1);
|
||||
bool func_ov000_02098838();
|
||||
unk32 func_ov000_02098910(unk32 param1, unk32 param2);
|
||||
void func_ov000_02098b8c(unk32 param1, unk32 param2);
|
||||
@@ -227,11 +230,13 @@ public:
|
||||
void func_ov000_020989e0();
|
||||
bool func_ov000_02098a60(unk32 param1);
|
||||
void func_ov000_02098a88(unk32 param1, unk32 param2);
|
||||
u32 func_ov000_02098ab4(bool param1, unk32 param2, unk32 param3, VecFx32 *param4);
|
||||
|
||||
static void func_ov000_020973f4(ActorRef *pOutRef, UnkStruct_ov000_020b539c *param2, ActorId actorId, ActorParams *pParams,
|
||||
int param5);
|
||||
|
||||
// overlay 17
|
||||
bool func_ov017_020beeec(unk32 param1);
|
||||
void func_ov017_020bf5c4(VecFx32 *param1, unk32 param2, unk32 param3, unk32 param4, unk32 param5);
|
||||
void func_ov017_020bf9c8(Actor *param1);
|
||||
};
|
||||
|
||||
@@ -0,0 +1,244 @@
|
||||
#pragma once
|
||||
|
||||
#include "Actor/Actor.hpp"
|
||||
#include "Actor/ActorProfile.hpp"
|
||||
#include "Render/ModelRender.hpp"
|
||||
#include "Unknown/UnkStruct_027e0ce0.hpp"
|
||||
#include "global.h"
|
||||
#include "types.h"
|
||||
|
||||
typedef u32 ActorShotArrowState;
|
||||
enum ActorShotArrowState_ {
|
||||
ActorShotArrowState_0 = 0,
|
||||
ActorShotArrowState_1 = 1,
|
||||
ActorShotArrowState_2 = 2,
|
||||
ActorShotArrowState_3 = 3,
|
||||
ActorShotArrowState_4 = 4,
|
||||
ActorShotArrowState_5 = 5,
|
||||
ActorShotArrowState_6 = 6,
|
||||
ActorShotArrowState_7 = 7,
|
||||
ActorShotArrowState_Max,
|
||||
};
|
||||
|
||||
class ActorShotArrow;
|
||||
|
||||
class ActorShotArrow_140 : public Actor_9C {
|
||||
public:
|
||||
/* 00 (vtable) */
|
||||
/* 20 */ STRUCT_PAD(0x20, 0x24);
|
||||
/* 24 */ bool mUnk_24;
|
||||
/* 25 */ unk8 mUnk_25;
|
||||
/* 26 */ unk8 mUnk_26;
|
||||
/* 27 */ unk8 mUnk_27;
|
||||
/* 28 */
|
||||
|
||||
ActorShotArrow_140(Actor *param1);
|
||||
};
|
||||
|
||||
class ActorShotArrow_178_Base : public UnkStruct_027e0ce0_38_Base {
|
||||
public:
|
||||
/* 00 (vtable) */
|
||||
/* 04 */
|
||||
|
||||
ActorShotArrow_178_Base();
|
||||
|
||||
// data_ov000_020b30d0
|
||||
/* 00 */ virtual ~ActorShotArrow_178_Base();
|
||||
/* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1) override;
|
||||
};
|
||||
|
||||
class ActorShotArrow_178 : public ActorShotArrow_178_Base {
|
||||
public:
|
||||
/* 00 (vtable) */
|
||||
/* 04 */ STRUCT_PAD(0x04, 0x08);
|
||||
/* 08 */ ActorShotArrow *mUnk_08;
|
||||
/* 0C */ VecFx32 mUnk_0C;
|
||||
/* 18 */ u16 mUnk_18;
|
||||
/* 1A */
|
||||
|
||||
ActorShotArrow_178(ActorShotArrow *param1);
|
||||
|
||||
// data_ov031_02114288
|
||||
/* 00 */ virtual ~ActorShotArrow_178() override;
|
||||
/* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1) override;
|
||||
/* 0C */ virtual bool vfunc_0C() override;
|
||||
|
||||
void func_ov031_020f3304();
|
||||
};
|
||||
|
||||
class ActorShotArrow_194_Base {
|
||||
public:
|
||||
/* 00 (vtable) */
|
||||
/* 04 */ ActorRef mUnk_04;
|
||||
/* 08 */ unk16 mUnk_08;
|
||||
/* 08 */ unk16 mUnk_0A;
|
||||
/* 0C */ VecFx32 mUnk_0C;
|
||||
/* 18 */ fx32 mUnk_18;
|
||||
/* 1C */ unk32 mUnk_1C;
|
||||
/* 20 */ unk32 mUnk_20;
|
||||
/* 24 */ unk32 mUnk_24;
|
||||
/* 28 */ unk32 mUnk_28;
|
||||
/* 2C */
|
||||
|
||||
ActorShotArrow_194_Base() {
|
||||
this->mUnk_04 = 0;
|
||||
this->mUnk_08 = 0;
|
||||
VecFx32_Init(0, 0, 0, &this->mUnk_0C);
|
||||
this->mUnk_18 = 0;
|
||||
this->mUnk_1C = 0;
|
||||
this->mUnk_20 = 0;
|
||||
this->mUnk_24 = 0;
|
||||
this->mUnk_28 = 0;
|
||||
}
|
||||
|
||||
// data_ov000_020b27c8
|
||||
/* 00 */ virtual ~ActorShotArrow_194_Base();
|
||||
/* 08 */ virtual void vfunc_08();
|
||||
/* 0C */ virtual bool vfunc_0C(Actor *param1, VecFx32 *vector);
|
||||
/* 10 */ virtual void vfunc_10(Actor *actor);
|
||||
};
|
||||
|
||||
class ActorShotArrow_194 : public ActorShotArrow_194_Base {
|
||||
public:
|
||||
/* 00 (base) */
|
||||
/* 2C */ ActorShotArrow *mUnk_2C;
|
||||
/* 30 */ unk32 mUnk_30;
|
||||
/* 34 */
|
||||
|
||||
const bool IsParam1_3Or4() const {
|
||||
Actor *pActor = (Actor *) this->mUnk_2C;
|
||||
return pActor->mUnk_5C.mParams[1] == 0x03 || pActor->mUnk_5C.mParams[1] == 0x04;
|
||||
}
|
||||
|
||||
ActorShotArrow_194(ActorShotArrow *param1);
|
||||
|
||||
// data_ov031_0211426c
|
||||
/* 0C */ virtual bool vfunc_0C(Actor *param1, VecFx32 *vector) override; // func_ov031_020f3c38
|
||||
/* 10 */ virtual void vfunc_10(Actor *actor) override; // func_ov031_020f38b0
|
||||
// /* 14 */ virtual void vfunc_14(Mat3p *, VecFx32 *);
|
||||
|
||||
void func_ov031_020f374c(Actor *param1);
|
||||
};
|
||||
|
||||
class ActorShotArrow_1C8 {
|
||||
public:
|
||||
/* 00 */ Actor *mUnk_00;
|
||||
/* 04 */ VecFx32 mUnk_04;
|
||||
/* 10 */ s16 mUnk_10;
|
||||
/* 12 */ s16 mUnk_12;
|
||||
/* 14 */
|
||||
|
||||
ActorShotArrow_1C8() {
|
||||
this->mUnk_00 = NULL;
|
||||
this->mUnk_04.x = 0;
|
||||
this->mUnk_04.y = 0;
|
||||
this->mUnk_04.z = 0;
|
||||
this->mUnk_10 = 0;
|
||||
this->mUnk_12 = 0;
|
||||
}
|
||||
};
|
||||
|
||||
class ActorShotArrow_1DC {
|
||||
public:
|
||||
/* 00 */ VecFx32 mUnk_00;
|
||||
/* 0C */
|
||||
|
||||
ActorShotArrow_1DC(unk32 param1, unk32 param2);
|
||||
~ActorShotArrow_1DC();
|
||||
};
|
||||
|
||||
class ActorShotArrow : public Actor {
|
||||
public:
|
||||
/* 000 (base) */
|
||||
/* 094 */ UnkSystem6_Derived2 mUnk_94;
|
||||
/* 09C */ bool mUnk_9C;
|
||||
/* 09C */ STRUCT_PAD(0x9D, 0xA0);
|
||||
/* 0A0 */ ModelRender mUnk_A0;
|
||||
/* 100 */ UnkSystem5_Derived1 mUnk_100;
|
||||
/* 120 */ unk32 mUnk_120;
|
||||
/* 124 */ STRUCT_PAD(0x124, 0x140);
|
||||
/* 140 */ ActorShotArrow_140 mUnk_140;
|
||||
/* 168 */ unk32 mUnk_168;
|
||||
/* 16C */ fx32 mUnk_16C;
|
||||
/* 170 */ u16 mUnk_170;
|
||||
/* 172 */ u16 mUnk_172;
|
||||
/* 174 */ unk16 mUnk_174;
|
||||
/* 176 */ unk16 mUnk_176;
|
||||
/* 178 */ ActorShotArrow_178 mUnk_178;
|
||||
/* 194 */ ActorShotArrow_194 mUnk_194;
|
||||
/* 1C8 */ ActorShotArrow_1C8 mUnk_1C8;
|
||||
/* 1DC */ ActorShotArrow_1DC mUnk_1DC;
|
||||
/* 1E0 */ STRUCT_PAD(0x1E8, 0x224);
|
||||
/* 224 */ Mat4x3p *mUnk_224;
|
||||
/* 228 */ Mat4x3p mUnk_228;
|
||||
/* 258 */ u16 mUnk_258;
|
||||
/* 25A */ bool mUnk_25A;
|
||||
/* 25B */ bool mUnk_25B;
|
||||
/* 25C */ bool mUnk_25C;
|
||||
/* 25D */ bool mUnk_25D;
|
||||
/* 25E */ u8 mUnk_25E;
|
||||
/* 25F */
|
||||
|
||||
ActorShotArrow();
|
||||
|
||||
/* 18 */ virtual bool vfunc_18(unk32 param1) override;
|
||||
/* 20 */ virtual void vfunc_20() override;
|
||||
/* 24 */ virtual void vfunc_24() override;
|
||||
/* 2C */ virtual void vfunc_2C(unk32 param1) override;
|
||||
/* 4C */ virtual ~ActorShotArrow() override;
|
||||
|
||||
void func_ov031_020f1868();
|
||||
void SetState(ActorShotArrowState state);
|
||||
|
||||
unk32 func_ov031_020f2270();
|
||||
void func_ov031_020f2280();
|
||||
void func_ov031_020f229c();
|
||||
void func_ov031_020f22d4(Mat3p *param1, VecFx32 *param2);
|
||||
void func_ov031_020f2654(Mat3p *param1);
|
||||
void func_ov031_020f2794(unk16 param1);
|
||||
void func_ov031_020f28ac();
|
||||
void func_ov031_020f2b8c();
|
||||
void func_ov031_020f2bbc();
|
||||
void func_ov031_020f2bec();
|
||||
void func_ov031_020f2c08(unk16 param1);
|
||||
void func_ov031_020f2cac(VecFx32 *param1, bool param2);
|
||||
void func_ov031_020f2ef0();
|
||||
void func_ov031_020f2f5c(VecFx32 *param1);
|
||||
bool func_ov031_020f2f9c();
|
||||
void func_ov031_020f3000();
|
||||
void func_ov031_020f311c(Mat4x3p *param1);
|
||||
bool func_ov031_020f3210(u16 param1);
|
||||
bool func_ov031_020f3258(u16 param1);
|
||||
void func_ov031_020f3d04(unk16 param1);
|
||||
|
||||
// data_ov031_021142c0
|
||||
void func_ov031_020f1a64();
|
||||
void func_ov031_020f1c24();
|
||||
void func_ov031_020f1dd4();
|
||||
void func_ov031_020f1f54();
|
||||
void func_ov031_020f206c();
|
||||
void func_ov031_020f2134();
|
||||
void func_ov031_020f21dc();
|
||||
void func_ov031_020f1874();
|
||||
|
||||
// data_ov031_02114300
|
||||
void func_ov031_020f1b04();
|
||||
void func_ov031_020f1c7c();
|
||||
void func_ov031_020f1e3c();
|
||||
void func_ov031_020f2010();
|
||||
void func_ov031_020f20bc();
|
||||
void func_ov031_020f2160();
|
||||
void func_ov031_020f2214();
|
||||
void func_ov031_020f1958();
|
||||
};
|
||||
|
||||
class ActorProfileShotArrow : public ActorProfile {
|
||||
public:
|
||||
/* 00 (base) */
|
||||
|
||||
ActorProfileShotArrow();
|
||||
|
||||
/* 0C */ virtual Actor *Create();
|
||||
|
||||
static ActorProfileShotArrow *GetProfile();
|
||||
};
|
||||
@@ -232,6 +232,7 @@ DEFINE_ACTOR_TYPE('MLCK', MLCK)
|
||||
DEFINE_ACTOR_TYPE('MNCB', MNCB)
|
||||
DEFINE_ACTOR_TYPE('MOCT', MOCT)
|
||||
DEFINE_ACTOR_TYPE('MRD2', MRD2)
|
||||
DEFINE_ACTOR_TYPE('MRD3', MRD3)
|
||||
DEFINE_ACTOR_TYPE('MRDA', MRDA)
|
||||
DEFINE_ACTOR_TYPE('MRDL', MRDL)
|
||||
DEFINE_ACTOR_TYPE('MRDO', MRDO)
|
||||
|
||||
@@ -1,96 +0,0 @@
|
||||
//! TODO: This file was generated automatically and might contain errors
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "Actor/Actor.hpp"
|
||||
#include "Actor/ActorProfile.hpp"
|
||||
#include "global.h"
|
||||
#include "types.h"
|
||||
|
||||
class ActorUnkAROW_C4 : public Actor_C4 {
|
||||
public:
|
||||
ActorUnkAROW_C4(Actor *param1);
|
||||
|
||||
/* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override;
|
||||
/* 04 */ virtual void vfunc_04() override;
|
||||
/* 08 */ virtual void vfunc_08() override;
|
||||
/* 0C */ virtual void vfunc_0C(unk32 param1) override;
|
||||
};
|
||||
|
||||
class ActorUnkAROW : public Actor {
|
||||
public:
|
||||
/* 00 (base) */
|
||||
/* 94 */
|
||||
|
||||
ActorUnkAROW();
|
||||
|
||||
/* 4C */ virtual ~ActorUnkAROW() override;
|
||||
|
||||
void func_ov031_020f1404(void);
|
||||
void func_ov031_020f1608(void);
|
||||
void func_ov031_020f173c(void);
|
||||
void func_ov031_020f1868(void);
|
||||
void func_ov031_020f1874(void);
|
||||
void func_ov031_020f1878(void);
|
||||
void func_ov031_020f18bc(void);
|
||||
void func_ov031_020f1958(void);
|
||||
void func_ov031_020f195c(void);
|
||||
void func_ov031_020f1a64(void);
|
||||
void func_ov031_020f1b04(void);
|
||||
void func_ov031_020f1c24(void);
|
||||
void func_ov031_020f1c7c(void);
|
||||
void func_ov031_020f1dd4(void);
|
||||
void func_ov031_020f1e3c(void);
|
||||
void func_ov031_020f1f54(void);
|
||||
void func_ov031_020f2010(void);
|
||||
void func_ov031_020f206c(void);
|
||||
void func_ov031_020f20bc(void);
|
||||
void func_ov031_020f2134(void);
|
||||
void func_ov031_020f2160(void);
|
||||
void func_ov031_020f21dc(void);
|
||||
void func_ov031_020f2214(void);
|
||||
void func_ov031_020f2270(void);
|
||||
void func_ov031_020f2280(void);
|
||||
void func_ov031_020f229c(void);
|
||||
void func_ov031_020f22d4(void);
|
||||
void func_ov031_020f2310(void);
|
||||
void func_ov031_020f2654(void);
|
||||
void func_ov031_020f2794(void);
|
||||
void func_ov031_020f28ac(void);
|
||||
void func_ov031_020f2b8c(void);
|
||||
void func_ov031_020f2bbc(void);
|
||||
void func_ov031_020f2bec(void);
|
||||
void func_ov031_020f2c08(void);
|
||||
void func_ov031_020f2cac(void);
|
||||
void func_ov031_020f2ef0(void);
|
||||
void func_ov031_020f2f5c(void);
|
||||
void func_ov031_020f2f9c(void);
|
||||
void func_ov031_020f3000(void);
|
||||
void func_ov031_020f311c(void);
|
||||
void func_ov031_020f3210(void);
|
||||
void func_ov031_020f3258(void);
|
||||
void func_ov031_020f3288(void);
|
||||
void func_ov031_020f32c4(void);
|
||||
void func_ov031_020f32e0(void);
|
||||
void func_ov031_020f3304(void);
|
||||
void func_ov031_020f3310(void);
|
||||
void func_ov031_020f33bc(void);
|
||||
void func_ov031_020f370c(void);
|
||||
void func_ov031_020f374c(void);
|
||||
void func_ov031_020f38b0(void);
|
||||
void func_ov031_020f3c38(void);
|
||||
void func_ov031_020f3d04(void);
|
||||
void func_ov031_020f3d4c(void);
|
||||
};
|
||||
|
||||
class ActorProfileUnkAROW : public ActorProfile {
|
||||
public:
|
||||
/* 00 (base) */
|
||||
|
||||
ActorProfileUnkAROW();
|
||||
~ActorProfileUnkAROW();
|
||||
|
||||
/* 0C */ virtual Actor *Create();
|
||||
|
||||
static ActorProfileUnkAROW *GetProfile();
|
||||
};
|
||||
@@ -19,8 +19,9 @@ public:
|
||||
|
||||
class ActorUnkGYAM : public Actor {
|
||||
public:
|
||||
/* 00 (base) */
|
||||
/* 94 */
|
||||
/* 000 (base) */
|
||||
/* 094 */ STRUCT_PAD(0x94, 0x220);
|
||||
/* 220 */ Mat4x3p mUnk_220;
|
||||
|
||||
ActorUnkGYAM();
|
||||
|
||||
|
||||
@@ -61,7 +61,7 @@ public:
|
||||
void func_ov084_02152cec(void);
|
||||
void func_ov084_02152d10(void);
|
||||
void func_ov084_02153018(void);
|
||||
void func_ov084_02153064(void);
|
||||
bool func_ov084_02153064(ActorRef *pRef, Mat4x3p **param2);
|
||||
void func_ov084_021530d4(void);
|
||||
void func_ov084_0215315c(void);
|
||||
void func_ov084_02153194(void);
|
||||
|
||||
@@ -19,8 +19,9 @@ public:
|
||||
|
||||
class ActorUnkMRD2 : public Actor {
|
||||
public:
|
||||
/* 00 (base) */
|
||||
/* 94 */
|
||||
/* 000 (base) */
|
||||
/* 094 */ STRUCT_PAD(0x094, 0x910);
|
||||
/* 910 */ unk32 mUnk_910;
|
||||
|
||||
ActorUnkMRD2();
|
||||
|
||||
@@ -114,7 +115,7 @@ public:
|
||||
void func_ov075_0215b578(void);
|
||||
void func_ov075_0215b914(void);
|
||||
void func_ov075_0215bbe8(void);
|
||||
void func_ov075_0215bbf0(void);
|
||||
bool func_ov075_0215bbf0(ActorRef *param1, unk32 *param2);
|
||||
void func_ov075_0215bc50(void);
|
||||
void func_ov075_0215bd40(void);
|
||||
void func_ov075_0215bd50(void);
|
||||
|
||||
@@ -12,7 +12,7 @@ public:
|
||||
|
||||
ActorUnkSWON();
|
||||
|
||||
/* 18 */ virtual bool vfunc_18(unk32 param_1) override;
|
||||
/* 18 */ virtual bool vfunc_18(unk32 param1) override;
|
||||
/* 4C */ virtual ~ActorUnkSWON() override;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user