mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-11 14:18:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

En_Dinofos (#235)

Browse Source 
* En_Dinofos

* PR

* NBS

* PR

* PR
This commit is contained in:
Maide
2021-08-06 22:14:09 +01:00
committed by GitHub
parent 161da0c881
commit 1836844ea8
8 changed files with 1403 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_effect_soft_sprite_old_init.c
+2 -5
View File
@@ -402,9 +402,8 @@ void EffectSsGSpk_SpawnSmall(GlobalContext* globalCtx, Actor* actor, Vec3f* pos,
}
// EffectSsDFire Spawn Functions
#ifdef NON_MATCHING
void EffectSsDFire_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep,
s16 alpha, s16 fadeDelay, s16 life) {
s16 alpha, s16 fadeDelay, s16 life, s32 arg9) {
EffectSsDFireInitParams initParams;
Math_Vec3f_Copy(&initParams.pos, pos);
@@ -415,12 +414,10 @@ void EffectSsDFire_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity,
initParams.alpha = alpha;
initParams.fadeDelay = fadeDelay;
initParams.life = life;
initParams.unk_30 = arg9;
EffectSs_Spawn(globalCtx, EFFECT_SS_D_FIRE, 128, &initParams);
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/EffectSsDFire_Spawn.s")
#endif
// EffectSsBubble Spawn Functions
src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c
+1350 -117
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.h
+35 -5
View File
@@ -5,13 +5,43 @@
struct EnDinofos;
typedef void (*EnDinofosActionFunc)(struct EnDinofos* this, GlobalContext* globalCtx);
typedef void (*EnDinofosActionFunc)(struct EnDinofos*, GlobalContext*);
typedef struct EnDinofos {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x140];
/* 0x0284 */ EnDinofosActionFunc actionFunc;
/* 0x0288 */ char unk_288[0x3BC];
/* 0x000 */ Actor actor;
/* 0x144 */ SkelAnime skelAnime;
/* 0x188 */ Vec3s jointTable[21];
/* 0x206 */ Vec3s morphTable[21];
/* 0x284 */ EnDinofosActionFunc actionFunc;
/* 0x288 */ u8 unk_288;
/* 0x289 */ u8 unk_289;
/* 0x28A */ u8 unk_28A;
/* 0x28B */ u8 unk_28B;
/* 0x28C */ s16 unk_28C;
/* 0x28E */ s16 unk_28E;
/* 0x290 */ s16 unk_290;
/* 0x290 */ s16 unk_292;
/* 0x294 */ UNK_TYPE1 unk_294[4];
/* 0x298 */ s16 camId;
/* 0x29A */ Vec3s unk_29A;
/* 0x2A0 */ s32 unk_2A0;
/* 0x2A4 */ f32 unk_2A4;
/* 0x2A8 */ f32 unk_2A8;
/* 0x2AC */ f32 unk_2AC;
/* 0x2B0 */ f32 unk_2B0;
/* 0x2B4 */ f32 unk_2B4;
/* 0x2B8 */ f32 unk_2B8;
/* 0x2BC */ Vec3f unk_2BC;
/* 0x2C8 */ Vec3f unk_2C8;
/* 0x2D4 */ Vec3f unk_2D4[4];
/* 0x304 */ Vec3f unk_304;
/* 0x310 */ UNK_TYPE1 unk_310[0x3C];
/* 0x34C */ Vec3f unk_34C;
/* 0x358 */ UNK_TYPE1 unk_358[0xC];
/* 0x364 */ ColliderJntSph colliderJntSph;
/* 0x384 */ ColliderJntSphElement colliderJntSphElement[9];
/* 0x5C4 */ ColliderQuad colliderQuad;
} EnDinofos; // size = 0x644
extern const ActorInit En_Dinofos_InitVars;
src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h
+3 -2
View File
@@ -11,8 +11,9 @@ typedef struct {
/* 0x26 */ s16 scaleStep;
/* 0x28 */ s16 alpha;
/* 0x2A */ s16 fadeDelay;
/* 0x2C */ s32 life;
} EffectSsDFireInitParams; // size = 0x30
/* 0x2C */ s16 life;
/* 0x30 */ s32 unk_30;
} EffectSsDFireInitParams; // size = 0x34
extern const EffectSsInit Effect_Ss_D_Fire_InitVars;