1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 07:20:16 +00:00

More actor cleanup Part 3 (#118)

* Add custom types for actor specific functions (like actions)

* Add a forward struct declaration for all other actors
This commit is contained in:
Roman971 2020-05-06 00:53:15 +02:00 committed by GitHub
parent f114df8929
commit 1425678d8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
477 changed files with 1817 additions and 792 deletions

View file

@ -5,7 +5,9 @@
#include <global.h>
/* Dirt particle effect */
typedef struct {
struct EnTkEff;
typedef struct EnTkEff {
/* 0x0000 */ u8 active;
/* 0x0001 */ u8 timeLeft;
/* 0x0002 */ u8 timeTotal;
@ -17,14 +19,14 @@ typedef struct {
/* 0x002C */ Vec3f accel;
} EnTkEff; // size = 0x0038
typedef struct EnTk EnTk;
struct EnTk;
typedef void EnTkFunc(EnTk* this, GlobalContext* globalCtx);
typedef void (*EnTkActionFunc)(struct EnTk*, GlobalContext*);
struct EnTk {
typedef struct EnTk {
/* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnim;
/* 0x0190 */ EnTkFunc* actionFunc;
/* 0x0190 */ EnTkActionFunc actionFunc;
/* 0x0194 */ ColliderCylinder collider;
/* 0x01E0 */ s16 h_1E0;
/* 0x01E2 */ char unk_1E2[0x26];
@ -45,7 +47,7 @@ struct EnTk {
/* 0x022A */ u16 hz_296[55];
/* 0x0304 */ Vec3f v3f_304;
/* 0x0310 */ EnTkEff eff[20];
}; // size = 0x0770
} EnTk; // size = 0x0770
extern const ActorInit En_Tk_InitVars;