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:
@@ -7,6 +7,7 @@ class UnkStruct_027e09a8 {
|
||||
public:
|
||||
void func_ov000_02071b30(unk32 param1, VecFx32 *pPos, unk32 param3);
|
||||
void func_ov000_02071d34(void *param1, unk32 param2, VecFx32 *pPos, unk32 param4);
|
||||
void func_ov000_02071eac(VecFx32 *pPos);
|
||||
};
|
||||
|
||||
extern UnkStruct_027e09a8 *data_027e09a8;
|
||||
|
||||
@@ -11,6 +11,7 @@ public:
|
||||
~UnkStruct_027e09b4();
|
||||
|
||||
void func_01fff60c(unk32 param1, unk32 param2, unk32 param3, u8 param4, unk32 param5, unk32 param6);
|
||||
void func_ov017_020c08c4(VecFx32 *param1, unk32 param2, unk32 param3, s32 param4, s32 param5, s32 param6);
|
||||
};
|
||||
|
||||
extern UnkStruct_027e09b4 *data_027e09b4;
|
||||
|
||||
@@ -8,6 +8,7 @@ public:
|
||||
/* 00 */ STRUCT_PAD(0x00, 0x34);
|
||||
/* 34 */ VecFx32 mUnk_34;
|
||||
|
||||
bool func_01ffd640(VecFx32 *param1);
|
||||
void func_ov000_02078230(unk32 param1);
|
||||
bool func_ov000_0207834c(VecFx32 *param1, unk32 param2, unk32 param3);
|
||||
bool func_ov000_02078764(VecFx32 *param1, void *param2, unk32 param3);
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "Actor/ActorRef.hpp"
|
||||
#include "Actor/ActorShotArrow.hpp"
|
||||
#include "global.h"
|
||||
#include "types.h"
|
||||
|
||||
@@ -10,6 +12,9 @@ public:
|
||||
UnkStruct_027e09c0();
|
||||
~UnkStruct_027e09c0();
|
||||
|
||||
// overlay 0
|
||||
void func_ov000_0207e58c(ActorRef param1, unk32 param2, u8 param3, ActorShotArrow_194 *param4);
|
||||
|
||||
// overlay 1
|
||||
void func_ov001_020be3c4();
|
||||
void func_ov001_020be394();
|
||||
|
||||
@@ -103,6 +103,8 @@ public:
|
||||
void func_ov000_0208053c(u16 param1);
|
||||
void func_ov000_020803ec(u16 param1);
|
||||
bool func_ov000_020802ec(u16 param1, VecFx32 *param2);
|
||||
void func_ov000_02080a5c(VecFx32 *param1);
|
||||
void func_ov000_02080a78(VecFx32 *param1);
|
||||
|
||||
VecFx32 *func_ov001_020b8a5c(unk32 spawnIndex, unk32 param1);
|
||||
};
|
||||
|
||||
@@ -57,24 +57,37 @@ public:
|
||||
void func_ov110_02185d3c(ItemId itemId);
|
||||
};
|
||||
|
||||
class UnkStruct_ov031_020f3310_00 {
|
||||
public:
|
||||
/* 00 */ STRUCT_PAD(0x00, 0x06);
|
||||
/* 06 */ u16 mUnk_06;
|
||||
/* 0A */
|
||||
};
|
||||
|
||||
class UnkStruct_ov031_020f3310_04 {
|
||||
public:
|
||||
/* 00 */ STRUCT_PAD(0x00, 0x24);
|
||||
/* 24 */ unk32 mUnk_24[4];
|
||||
/* 34 */
|
||||
};
|
||||
|
||||
class UnkStruct_ov031_020f3310 {
|
||||
public:
|
||||
/* 00 */ UnkStruct_ov031_020f3310_00 *mUnk_00;
|
||||
/* 04 */ UnkStruct_ov031_020f3310_04 *mUnk_04;
|
||||
/* 08 */ VecFx16 mUnk_08;
|
||||
/* 20 */
|
||||
};
|
||||
|
||||
class UnkStruct_027e0ce0_38_Base {
|
||||
public:
|
||||
/* 00 (vtable) */
|
||||
/* 04 */ void *mUnk_04;
|
||||
/* 08 */ void *mUnk_08;
|
||||
/* 0C */ unk32 mUnk_0C;
|
||||
/* 10 */
|
||||
|
||||
UnkStruct_027e0ce0_38_Base() {
|
||||
this->mUnk_04 = NULL;
|
||||
this->mUnk_08 = NULL;
|
||||
this->mUnk_0C = 0;
|
||||
}
|
||||
/* 04 */
|
||||
|
||||
// data_ov000_020b2838
|
||||
/* 00 */ virtual ~UnkStruct_027e0ce0_38_Base();
|
||||
/* 08 */ virtual void vfunc_08();
|
||||
/* 0C */ virtual void vfunc_0C();
|
||||
/* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1);
|
||||
/* 0C */ virtual bool vfunc_0C();
|
||||
/* 10 */ virtual void vfunc_10();
|
||||
/* 14 */
|
||||
};
|
||||
@@ -169,6 +182,9 @@ public:
|
||||
class UnkStruct_027e0ce0_38 : public UnkStruct_027e0ce0_38_Base {
|
||||
public:
|
||||
/* 000 (base) */
|
||||
/* 04 */ void *mUnk_04;
|
||||
/* 08 */ void *mUnk_08;
|
||||
/* 0C */ unk32 mUnk_0C;
|
||||
/* 010 */ UnkStruct_027e0ce0_38_10 *mUnk_010;
|
||||
/* 014 */ Input mUnk_014;
|
||||
/* 01C */ VecFx32 mPos;
|
||||
@@ -209,7 +225,7 @@ public:
|
||||
|
||||
// data_ov026_0213562c
|
||||
/* 00 */ virtual ~UnkStruct_027e0ce0_38() override;
|
||||
/* 0C */ virtual void vfunc_0C() override;
|
||||
/* 0C */ virtual bool vfunc_0C() override;
|
||||
};
|
||||
|
||||
class UnkStruct_027e0ce0_40_Base_14 {
|
||||
@@ -375,6 +391,12 @@ public:
|
||||
UnkStruct_027e0ce0_3C();
|
||||
};
|
||||
|
||||
class UnkStruct_027e0ce0_1C {
|
||||
public:
|
||||
/* 00 */ STRUCT_PAD(0x00, 0x0C);
|
||||
/* 0C */ MapObjectProfile_Derived2_20_Base *mUnk_0C;
|
||||
};
|
||||
|
||||
// PlayerManager?
|
||||
class UnkStruct_027e0ce0 : public AutoInstance<UnkStruct_027e0ce0> {
|
||||
public:
|
||||
@@ -388,7 +410,7 @@ public:
|
||||
/* 10 */ unk32 *mUnk_10;
|
||||
/* 14 */ unk32 *mUnk_14;
|
||||
/* 18 */ unk32 *mUnk_18;
|
||||
/* 1C */ unk32 *mUnk_1C;
|
||||
/* 1C */ UnkStruct_027e0ce0_1C *mUnk_1C;
|
||||
/* 20 */ unk32 *mUnk_20;
|
||||
/* 24 */ unk32 mUnk_24;
|
||||
/* 28 */ ItemManager *mUnk_28;
|
||||
@@ -413,7 +435,9 @@ public:
|
||||
void func_ov000_0208bbd4(unk32 param1, VecFx32 *param2, u16 param3);
|
||||
|
||||
void func_ov000_0208bbd4(unk32 param1, VecFx32 *param2, void *param3);
|
||||
void func_ov000_0208bc1c(unk32 param1, unk32 param2, unk32 param3, unk32 param4, unk32 param5, unk32 param6);
|
||||
void func_ov000_0208bc9c(unk32 param1, unk32 param2);
|
||||
void func_ov000_0208bd30(bool param1, unk32 param2, unk32 param3, unk32 param4);
|
||||
|
||||
static UnkStruct_027e0ce0_34 *func_ov000_0205c904();
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@ public:
|
||||
~UnkStruct_027e0cec();
|
||||
|
||||
void func_ov000_0209feac(unk32 param1, VecFx32 *param2, unk32 param3, unk32 param4, unk32 param5);
|
||||
void func_ov000_0209ff24(unk32 param1, VecFx32 *param2, VecFx16 *param3, unk32 param4);
|
||||
void func_ov000_0209ff8c(UnkStruct_PlayerGet_ec *param1, unk32 param2, VecFx32 *param3, unk32 param4);
|
||||
void func_ov000_020a0000(UnkStruct_PlayerGet_ec *param1, void *param2, unk32 *param3, VecFx32 *param4, unk32 param5);
|
||||
void func_ov000_020a0110(UnkStruct_PlayerGet_ec *param1);
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
#pragma once
|
||||
|
||||
#include <math.h>
|
||||
#include <types.h>
|
||||
|
||||
class UnkStruct_027e0d30 {
|
||||
public:
|
||||
void func_ov031_020d9684(u16 param1, VecFx32 *param2);
|
||||
};
|
||||
|
||||
extern UnkStruct_027e0d30 *data_027e0d30;
|
||||
Reference in New Issue
Block a user