summaryrefslogtreecommitdiff
path: root/include/z64actor.h
diff options
context:
space:
mode:
authorAnghelo Carvajal <angheloalf95@gmail.com>2023-06-18 02:43:47 -0400
committerGitHub <noreply@github.com>2023-06-18 16:43:47 +1000
commit587d12e3cbb2a1ffb6774c0823c54ce0e80a579b (patch)
tree77e25fd29e6bce3b979b7d50ec3851c9d2a9fc1e /include/z64actor.h
parent9c40dea7709726bd29fac8253586bc96c9f3ab8a (diff)
Yet another header cleanup (#1284)
* thread, scene and interface * non header stuff * fix missing stuff * z64sound_source.h * collision_check.h * Update include/z64sound_source.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update include/z64scene.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update include/z64thread.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * review * review * Update src/code/z_collision_check.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_sound_source.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> --------- Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Diffstat (limited to 'include/z64actor.h')
-rw-r--r--include/z64actor.h58
1 files changed, 2 insertions, 56 deletions
diff --git a/include/z64actor.h b/include/z64actor.h
index 3051f2c6e..e08a477e6 100644
--- a/include/z64actor.h
+++ b/include/z64actor.h
@@ -25,71 +25,17 @@ typedef void(*ActorFunc)(struct Actor* this, struct PlayState* play);
typedef u16 (*NpcGetTextIdFunc)(struct PlayState*, struct Actor*);
typedef s16 (*NpcUpdateTalkStateFunc)(struct PlayState*, struct Actor*);
-typedef struct {
+typedef struct PosRot {
/* 0x00 */ Vec3f pos;
/* 0x0C */ Vec3s rot;
} PosRot; // size = 0x14
typedef struct {
- /* 0x00 */ u8 attack[32];
-} DamageTable; // size = 0x20
-
-typedef struct {
- /* 0x0 */ u8 health;
- /* 0x2 */ s16 cylRadius;
- /* 0x4 */ s16 cylHeight;
- /* 0x6 */ u8 mass;
-} CollisionCheckInfoInit; // size = 0x8
-
-typedef struct {
- /* 0x0 */ u8 health;
- /* 0x2 */ s16 cylRadius;
- /* 0x4 */ s16 cylHeight;
- /* 0x6 */ s16 cylYShift;
- /* 0x8 */ u8 mass;
-} CollisionCheckInfoInit2; // size = 0xC
-
-typedef struct {
- /* 0x00 */ DamageTable* damageTable;
- /* 0x04 */ Vec3f displacement;
- /* 0x10 */ s16 cylRadius;
- /* 0x12 */ s16 cylHeight;
- /* 0x14 */ s16 cylYShift;
- /* 0x16 */ u8 mass;
- /* 0x17 */ u8 health;
- /* 0x18 */ u8 damage;
- /* 0x19 */ u8 damageEffect;
- /* 0x1A */ u8 atHitEffect;
- /* 0x1B */ u8 acHitEffect;
-} CollisionCheckInfo; // size = 0x1C
-
-typedef struct {
- /* 0x00 */ s32 unk0;
- /* 0x04 */ s32 unk4;
- /* 0x08 */ f32 unk8;
- /* 0x0C */ f32 unkC;
- /* 0x10 */ f32 unk10;
- /* 0x14 */ f32 unk14;
- /* 0x18 */ f32 unk18;
- /* 0x1C */ f32 unk1C;
- /* 0x20 */ f32 unk20;
- /* 0x24 */ f32 unk24;
- /* 0x28 */ f32 unk28;
- /* 0x2C */ f32 unk2C;
- /* 0x30 */ s16 unk30;
- /* 0x32 */ s16 unk32;
- /* 0x34 */ s16 unk34;
- /* 0x36 */ s16 unk36;
- /* 0x38 */ s16 unk38;
- /* 0x3A */ s16 unk3A;
-} ActorEnTest20C; // size = 0x3C
-
-typedef struct {
/* 0x0 */ s16 unk_0; // frame?
/* 0x2 */ Vec3s unk_2; // scale
} struct_80124618; // size = 0x8
-typedef struct {
+typedef struct ActorInit {
/* 0x00 */ s16 id;
/* 0x02 */ u8 type;
/* 0x04 */ u32 flags;