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

En_Skb (#262) 

* En_Skb

* a

* a

* a

* Func namesW
This commit is contained in:
Maide 2021-09-19 15:05:21 +01:00 committed by GitHub
parent b65d363cec
commit 3c779d7fd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 1033 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions.h
View File

@ -920,7 +920,7 @@ void func_800BE504(Actor* actor, ColliderCylinder* collider);
// void func_800BE568(void); // void func_800BE568(void);
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[], s32 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);
void func_800BF7CC(GlobalContext* globalCtx, Actor* actor, Vec3f limbPos[], s32 arg3, s32 arg4, f32 arg5, f32 arg6); void func_800BF7CC(GlobalContext* globalCtx, Actor* actor, Vec3f limbPos[], s32 arg3, s32 arg4, f32 arg5, f32 arg6);
void ActorOverlayTable_FaultPrint(void* arg0, void* arg1); // ActorOverlayTable_FaultPrint void ActorOverlayTable_FaultPrint(void* arg0, void* arg1); // ActorOverlayTable_FaultPrint
void* ActorOverlayTable_FaultAddrConv(void* arg0, void* arg1); // ActorOverlayTable_FaultAddrConv void* ActorOverlayTable_FaultAddrConv(void* arg0, void* arg1); // ActorOverlayTable_FaultAddrConv

3
spec
View File

@ -2214,8 +2214,7 @@ beginseg
name "ovl_En_Skb" name "ovl_En_Skb"
compress compress
include "build/src/overlays/actors/ovl_En_Skb/z_en_skb.o" include "build/src/overlays/actors/ovl_En_Skb/z_en_skb.o"
include "build/data/ovl_En_Skb/ovl_En_Skb.data.o" include "build/src/overlays/actors/ovl_En_Skb/ovl_En_Skb_reloc.o"
include "build/data/ovl_En_Skb/ovl_En_Skb.reloc.o"
endseg endseg
beginseg beginseg

5
src/overlays/actors/ovl_En_Encount4/z_en_encount4.h
View File

@ -10,7 +10,10 @@ typedef void (*EnEncount4ActionFunc)(struct EnEncount4*, GlobalContext*);
typedef struct EnEncount4 { typedef struct EnEncount4 {
/* 0x0000 */ Actor actor; /* 0x0000 */ Actor actor;
/* 0x0144 */ EnEncount4ActionFunc actionFunc; /* 0x0144 */ EnEncount4ActionFunc actionFunc;
/* 0x0148 */ char unk_144[0x10]; /* 0x0148 */ char unk_148[0x4];
/* 0x014C */ s16 unk_14C;
/* 0x014E */ s16 unk_14E;
/* 0x0150 */ char unk_150[0x8];
} EnEncount4; // size = 0x158 } EnEncount4; // size = 0x158
extern const ActorInit En_Encount4_InitVars; extern const ActorInit En_Encount4_InitVars;

1070
src/overlays/actors/ovl_En_Skb/z_en_skb.c
View File

File diff suppressed because it is too large Load Diff

31
src/overlays/actors/ovl_En_Skb/z_en_skb.h
View File

@ -7,11 +7,38 @@ struct EnSkb;
typedef void (*EnSkbActionFunc)(struct EnSkb*, GlobalContext*); typedef void (*EnSkbActionFunc)(struct EnSkb*, GlobalContext*);
#define ENSKB_GET_F0(thisx) (((thisx)->params >> 4) & 0xF)
typedef struct {
f32 x;
f32 z;
} EnSkbVec2f;
typedef struct EnSkb { typedef struct EnSkb {
/* 0x0000 */ Actor actor; /* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0xE4]; /* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ ColliderJntSph collider;
/* 0x01A8 */ ColliderJntSphElement colliderElements[2];
/* 0x0228 */ EnSkbActionFunc actionFunc; /* 0x0228 */ EnSkbActionFunc actionFunc;
/* 0x022C */ char unk_22C[0x1BC]; /* 0x022C */ f32 unk_22C;
/* 0x0230 */ f32 unk_230;
/* 0x0234 */ Vec3f unk_234[14];
/* 0x02DC */ s32 unk_2DC;
/* 0x02E0 */ Vec3s jointTable[20];
/* 0x0358 */ Vec3s morphTable[20];
/* 0x03D0 */ s16 unk_3D0;
/* 0x03D2 */ s16 unk_3D2;
/* 0x03D4 */ s16 unk_3D4;
/* 0x03D6 */ s16 unk_3D6;
/* 0x03D8 */ s16 unk_3D8;
/* 0x03DA */ s16 unk_3DA;
/* 0x03DC */ s16 unk_3DC;
/* 0x03DE */ s16 unk_3DE;
/* 0x03E0 */ s16 unk_3E0;
/* 0x03E2 */ s16 unk_3E2;
/* 0x03E4 */ u8 unk_3E4;
/* 0x03E5 */ u8 unk_3E5;
/* 0x03E6 */ u8 unk_3E6;
} EnSkb; // size = 0x3E8 } EnSkb; // size = 0x3E8
extern const ActorInit En_Skb_InitVars; extern const ActorInit En_Skb_InitVars;

5
undefined_syms.txt
View File

@ -3287,6 +3287,11 @@ D_06003584 = 0x06003584;
D_06005EF8 = 0x06005EF8; D_06005EF8 = 0x06005EF8;
D_0600697C = 0x0600697C; D_0600697C = 0x0600697C;
D_06006D90 = 0x06006D90; D_06006D90 = 0x06006D90;
D_060009E4 = 0x060009E4;
D_060015EC = 0x060015EC;
D_0600270C = 0x0600270C;
D_06002AC8 = 0x06002AC8;
D_060064E0 = 0x060064E0;
// ovl_En_Slime // ovl_En_Slime