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

En_Floormas (#307) 

* En_Floormas

* Format
This commit is contained in:
Maide 2021-11-04 22:30:05 +00:00 committed by GitHub
parent 31e4089a4b
commit 418e09bf6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 1115 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/functions.h
View File

@ -538,10 +538,10 @@ void EffectSpark_Init(EffSparkParams* params, EffSparkParams* init);
void EffectSpark_Destroy(EffSparkParams* params);
s32 EffectSpark_Update(EffSparkParams* params);
void EffectSpark_Draw(EffSparkParams* params, GraphicsContext* gfxCtx);
// void func_800AE2A0(void);
void func_800AE2A0(GlobalContext* globalCtx, Color_RGBA8* arg1, s16 arg2, s16 arg3);
void func_800AE434(GlobalContext* globalCtx, Color_RGBA8* color, s16 sParm3, s16 sParm4);
void func_800AE5A0(GlobalContext* globalCtx);
// void func_800AE5E4(void);
void func_800AE5E4(GlobalContext* globalCtx, Color_RGBA8* arg1, s16 arg2, s16 arg3);
void func_800AE778(GlobalContext* globalCtx, Color_RGBA8* color, s16 param_3, s16 param_4);
void func_800AE8EC(GlobalContext* globalCtx);
void func_800AE930(CollisionContext* colCtx, s32 param_2, Vec3f* param_3, f32 param_4, s16 param_5, CollisionPoly* param_6, s32 param_7);

3
spec
View File

@ -1161,8 +1161,7 @@ beginseg
name "ovl_En_Floormas"
compress
include "build/src/overlays/actors/ovl_En_Floormas/z_en_floormas.o"
include "build/data/ovl_En_Floormas/ovl_En_Floormas.data.o"
include "build/data/ovl_En_Floormas/ovl_En_Floormas.reloc.o"
include "build/src/overlays/actors/ovl_En_Floormas/ovl_En_Floormas_reloc.o"
endseg
beginseg

1172
src/overlays/actors/ovl_En_Floormas/z_en_floormas.c
View File

File diff suppressed because it is too large Load Diff

25
src/overlays/actors/ovl_En_Floormas/z_en_floormas.h
View File

@ -7,11 +7,32 @@ struct EnFloormas;
typedef void (*EnFloormasActionFunc)(struct EnFloormas*, GlobalContext*);
#define ENFLOORMAS_GET_7FFF(thisx) ((thisx)->params & 0x7FFF)
#define ENFLOORMAS_GET_8000(thisx) ((thisx)->params & 0x8000)
enum {
/* 0x00 */ ENFLOORMAS_GET_7FFF_0,
/* 0x10 */ ENFLOORMAS_GET_7FFF_10 = 0x10,
/* 0x20 */ ENFLOORMAS_GET_7FFF_20 = 0x20,
/* 0x40 */ ENFLOORMAS_GET_7FFF_40 = 0x40,
};
typedef struct EnFloormas {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x44];
/* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ EnFloormasActionFunc actionFunc;
/* 0x018C */ char unk_18C[0x214];
/* 0x018C */ u8 unk_18C;
/* 0x018E */ s16 unk_18E;
/* 0x0190 */ s16 unk_190;
/* 0x0192 */ s16 unk_192;
/* 0x0194 */ s16 unk_194;
/* 0x0196 */ Vec3s jointTable[25];
/* 0x022C */ Vec3s morphTable[25];
/* 0x02C4 */ f32 unk_2C4;
/* 0x02C8 */ f32 unk_2C8;
/* 0x02CC */ f32 unk_2CC;
/* 0x02D0 */ Vec3f unk_2D0[11];
/* 0x0354 */ ColliderCylinder collider;
} EnFloormas; // size = 0x3A0
extern const ActorInit En_Floormas_InitVars;

4
tools/disasm/functions.txt
View File

@ -6338,8 +6338,8 @@
0x808D2DC0:("func_808D2DC0",),
0x808D2E34:("func_808D2E34",),
0x808D316C:("EnFloormas_Update",),
0x808D3488:("func_808D3488",),
0x808D34C4:("func_808D34C4",),
0x808D3488:("EnFloormas_OverrideLimbDraw",),
0x808D34C4:("EnFloormas_PostLimbDraw",),
0x808D3630:("EnFloormas_Draw",),
0x808D3754:("func_808D3754",),
0x808D3E20:("EnRd_Init",),