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

En_Gs (#431) 

* En_Gs

* PR

* PR

* PR

* Update src/overlays/actors/ovl_En_Gs/z_en_gs.h

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
This commit is contained in:
Maide 2021-12-21 15:57:41 +00:00 committed by GitHub
parent 51ee1c2c70
commit aad8f64c65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 1062 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/functions.h
View File

@ -603,7 +603,8 @@ void EffectSsGSpk_SpawnSmall(GlobalContext* globalCtx, Actor* actor, Vec3f* pos,
void EffectSsKiraKira_SpawnDispersed(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor, Color_RGBA8* envColor, s16 scale, s32 life);
// void EffectSsKiraKira_SpawnFocused(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE2 param_7, UNK_TYPE4 param_8);
// void EffectSsBomb2_SpawnFade(UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4);
// void EffectSsBomb2_SpawnLayered(UNK_TYPE4 param_1, Vec3f* param_2, Vec3f* param_3, Vec3f* param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6);
void EffectSsBomb2_SpawnLayered(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale,
s16 scaleStep);
// void EffectSsBlast_Spawn(UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, Color_RGBA8* param_5, Color_RGBA8* param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE2 param_10);
// void EffectSsBlast_SpawnWhiteCustomScale(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7);
// void EffectSsBlast_SpawnShockwave(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE2 param_7);
@ -875,7 +876,7 @@ s32 func_800BC5EC(GlobalContext* globalCtx, Actor* actor);
void func_800BC620(Vec3f* arg0, Vec3f* arg1, u8 arg2, GlobalContext* globalCtx);
// void func_800BC770(void);
// void func_800BC7D8(void);
// void func_800BC848(void);
void func_800BC848(Actor* actor, GlobalContext* globalCtx, s16 arg2, s16 arg3);
// void func_800BC8B8(void);
// void func_800BCB50(void);
void func_800BCB70(Actor* actor, u16 arg1, u16 arg2, s16 arg3, s16 arg4);
@ -2950,8 +2951,8 @@ void func_80165438(UNK_PTR param_1);
// void func_80165460(void);
// void func_80165608(void);
// void func_80165630(void);
// void func_80165658(void);
void func_8016566C(s32 arg0);
void func_80165658(u32 arg0);
void func_8016566C(u32 arg0);
void func_80165690(void);
// void func_801656A4(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7, UNK_TYPE4 param_8);
// void func_80165DCC(void);

3
spec
View File

@ -2196,8 +2196,7 @@ beginseg
name "ovl_En_Gs"
compress
include "build/src/overlays/actors/ovl_En_Gs/z_en_gs.o"
include "build/data/ovl_En_Gs/ovl_En_Gs.data.o"
include "build/data/ovl_En_Gs/ovl_En_Gs.reloc.o"
include "build/src/overlays/actors/ovl_En_Gs/ovl_En_Gs_reloc.o"
endseg
beginseg

1055
src/overlays/actors/ovl_En_Gs/z_en_gs.c
View File

File diff suppressed because it is too large Load Diff

50
src/overlays/actors/ovl_En_Gs/z_en_gs.h
View File

@ -5,9 +5,57 @@
struct EnGs;
typedef void (*EnGsActionFunc)(struct EnGs*, GlobalContext*);
#define ENGS_GET_1F(thisx) ((thisx)->params & 0x1F)
#define ENGS_GET_FE0(thisx) (((thisx)->params >> 5) & 0x7F)
#define ENGS_GET_F000(thisx) (((thisx)->params >> 0xC) & 0xF)
enum {
/* 0 */ ENGS_0,
/* 1 */ ENGS_1,
/* 2 */ ENGS_2,
/* 3 */ ENGS_3,
};
typedef struct EnGs {
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0xDC];
/* 0x144 */ ColliderCylinder collider;
/* 0x190 */ EnGsActionFunc actionFunc;
/* 0x194 */ s8 unk_194;
/* 0x195 */ u8 unk_195;
/* 0x196 */ u8 unk_196;
/* 0x197 */ s8 unk_197;
/* 0x198 */ s16 unk_198;
/* 0x19A */ s16 unk_19A;
/* 0x19C */ s8 unk_19C;
/* 0x19D */ u8 unk_19D;
/* 0x19E */ Vec3s unk_19E[3];
/* 0x1B0 */ Vec3f unk_1B0[2];
/* 0x1C8 */ UNK_TYPE1 unk1C8[0xC];
/* 0x1D4 */ s16 unk_1D4;
/* 0x1D6 */ UNK_TYPE1 unk1D6[0x6];
/* 0x1DC */ f32 unk_1DC;
/* 0x1E0 */ f32 unk_1E0;
/* 0x1E4 */ f32 unk_1E4;
/* 0x1E8 */ f32 unk_1E8;
/* 0x1EC */ f32 unk_1EC;
/* 0x1F0 */ f32 unk_1F0;
/* 0x1F4 */ Color_RGB8 unk_1F4;
/* 0x1F7 */ Color_RGB8 unk_1F7;
/* 0x1FA */ Color_RGB8 unk_1FA;
/* 0x200 */ f32 unk_200;
/* 0x204 */ s32 unk_204;
/* 0x208 */ s32 unk_208;
/* 0x20C */ s32 unk_20C;
/* 0x210 */ u16 unk_210;
/* 0x212 */ s16 unk_212;
/* 0x214 */ UNK_TYPE1 unk214[2];
/* 0x216 */ s16 unk_216;
/* 0x218 */ s16 unk_218;
/* 0x21A */ s16 unk_21A;
/* 0x21C */ s16 unk_21C;
/* 0x21E */ s16 unk_21E;
} EnGs; // size = 0x220
extern const ActorInit En_Gs_InitVars;