falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

En_Tite (#318) 

* En_Tite

* Fix
This commit is contained in:
Maide 2021-10-27 15:02:26 +01:00 committed by GitHub
parent a60c47a970
commit c97a8e5225
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 1107 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/functions.h
View File

@ -912,9 +912,9 @@ u8 Actor_ApplyDamage(Actor* actor); // returns current health
void func_800BE258(Actor* actor, UNK_PTR arg1); void func_800BE258(Actor* actor, UNK_PTR arg1);
void func_800BE2B8(Actor* actor, ColliderJntSph* jntSphere); void func_800BE2B8(Actor* actor, ColliderJntSph* jntSphere);
void func_800BE33C(Vec3f* arg0, Vec3f* arg1, Vec3s* arg2, s32 arg3); void func_800BE33C(Vec3f* arg0, Vec3f* arg1, Vec3s* arg2, s32 arg3);
// void func_800BE3D0(void); void func_800BE3D0(Actor* actor, s16 arg1, s16* arg2);
void func_800BE504(Actor* actor, ColliderCylinder* collider); void func_800BE504(Actor* actor, ColliderCylinder* collider);
// void func_800BE568(void); void func_800BE568(Actor* actor, ColliderSphere* collider);
void func_800BE5CC(Actor* actor, ColliderJntSph* collider, s32 arg2); void func_800BE5CC(Actor* actor, ColliderJntSph* collider, s32 arg2);
// void func_800BE63C(void); // void func_800BE63C(void);
void func_800BE680(GlobalContext* globalCtx, Actor* actor, Vec3f limbPos[], s16 arg3, f32 arg4, f32 arg5, f32 arg6, u8 mode); void func_800BE680(GlobalContext* globalCtx, Actor* actor, Vec3f limbPos[], s16 arg3, f32 arg4, f32 arg5, f32 arg6, u8 mode);

3
spec
View File

@ -880,8 +880,7 @@ beginseg
name "ovl_En_Tite" name "ovl_En_Tite"
compress compress
include "build/src/overlays/actors/ovl_En_Tite/z_en_tite.o" include "build/src/overlays/actors/ovl_En_Tite/z_en_tite.o"
include "build/data/ovl_En_Tite/ovl_En_Tite.data.o" include "build/src/overlays/actors/ovl_En_Tite/ovl_En_Tite_reloc.o"
include "build/data/ovl_En_Tite/ovl_En_Tite.reloc.o"
endseg endseg
beginseg beginseg

1144
src/overlays/actors/ovl_En_Tite/z_en_tite.c
View File

File diff suppressed because it is too large Load Diff

27
src/overlays/actors/ovl_En_Tite/z_en_tite.h
View File

@ -7,11 +7,34 @@ struct EnTite;
typedef void (*EnTiteActionFunc)(struct EnTite*, GlobalContext*); typedef void (*EnTiteActionFunc)(struct EnTite*, GlobalContext*);
enum {
/* -4 */ ENTITE_MINUS_4 = -4,
/* -3 */ ENTITE_MINUS_3,
/* -2 */ ENTITE_MINUS_2,
/* -1 */ ENTITE_MINUS_1,
/* 0 */ ENTITE_MINUS_0,
};
typedef struct EnTite { typedef struct EnTite {
/* 0x0000 */ Actor actor; /* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x170]; /* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ Vec3s jointTable[25];
/* 0x021E */ Vec3s morphTable[25];
/* 0x02B4 */ EnTiteActionFunc actionFunc; /* 0x02B4 */ EnTiteActionFunc actionFunc;
/* 0x02B8 */ char unk_2B8[0x14C]; /* 0x02B8 */ u8 unk_2B8;
/* 0x02B9 */ u8 unk_2B9;
/* 0x02BA */ s8 unk_2BA;
/* 0x02BB */ u8 unk_2BB;
/* 0x02BC */ s16 unk_2BC;
/* 0x02BE */ s16 unk_2BE;
/* 0x02C0 */ s32 unk_2C0;
/* 0x02C4 */ f32 unk_2C4;
/* 0x02C8 */ f32 unk_2C8;
/* 0x02CC */ f32 unk_2CC;
/* 0x02D0 */ Vec3f unk_2D0[9];
/* 0x033C */ Vec3f unk_33C[9];
/* 0x03A8 */ Gfx* unk_3A8;
/* 0x03AC */ ColliderSphere collider;
} EnTite; // size = 0x404 } EnTite; // size = 0x404
extern const ActorInit En_Tite_InitVars; extern const ActorInit En_Tite_InitVars;

4
tools/disasm/functions.txt
View File

@ -5498,8 +5498,8 @@
0x80895FF8:("func_80895FF8",), 0x80895FF8:("func_80895FF8",),
0x808963B4:("func_808963B4",), 0x808963B4:("func_808963B4",),
0x808964E8:("EnTite_Update",), 0x808964E8:("EnTite_Update",),
0x80896750:("func_80896750",), 0x80896750:("EnTite_OverrideLimbDraw",),
0x80896788:("func_80896788",), 0x80896788:("EnTite_PostLimbDraw",),
0x8089695C:("EnTite_Draw",), 0x8089695C:("EnTite_Draw",),
0x80896F30:("EnPeehat_Init",), 0x80896F30:("EnPeehat_Init",),
0x808970F4:("EnPeehat_Destroy",), 0x808970F4:("EnPeehat_Destroy",),

6
undefined_syms.txt
View File

@ -3618,6 +3618,12 @@ D_06000A14 = 0x06000A14;
D_06000C70 = 0x06000C70; D_06000C70 = 0x06000C70;
D_060012E4 = 0x060012E4; D_060012E4 = 0x060012E4;
D_06003A20 = 0x06003A20; D_06003A20 = 0x06003A20;
D_06001300 = 0x06001300;
D_06001700 = 0x06001700;
D_06001900 = 0x06001900;
D_06001B00 = 0x06001B00;
D_06001F00 = 0x06001F00;
D_06002100 = 0x06002100;
// ovl_En_Tk // ovl_En_Tk