mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-08-21 22:10:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

En_Dodongo (#242)

Browse Source 
* En_Dodongo

* NBS

* PR

* PR

* PR

* PR
This commit is contained in:
Maide
2021-09-01 23:53:12 +01:00
committed by GitHub
parent f21f393fcc
commit c96d1df320
8 changed files with 1027 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_Bombf/z_en_bombf.h
+3 -1
View File
@@ -9,7 +9,9 @@ typedef void (*EnBombfActionFunc)(struct EnBombf*, GlobalContext*);
typedef struct EnBombf {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0xB0];
/* 0x0144 */ char unk_144[0xAC];
/* 0x01F0 */ s16 timer;
/* 0x01F2 */ char unk_1F2[0x2];
/* 0x01F4 */ EnBombfActionFunc actionFunc;
/* 0x01F8 */ char unk_1F8[0x10];
} EnBombf; // size = 0x208
src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c
+10 -4
View File
@@ -279,10 +279,17 @@ static InitChainEntry sInitChain[] = {
void EnDinofos_Init(Actor* thisx, GlobalContext* globalCtx) {
static s32 D_8089E364 = 0;
static EffBlureInit2 D_8089E368 = {
{ 0, 0, 0, 0, 0, 8, 0, 0 }, { 255, 255, 255, 255 }, { 255, 255, 255, 64 },
{ 255, 255, 255, 0 }, { 255, 255, 255, 0 }, { 8, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
0,
8,
0,
{ 255, 255, 255, 255 },
{ 255, 255, 255, 64 },
{ 255, 255, 255, 0 },
{ 255, 255, 255, 0 },
8, 0, 2, 0,
{ 0, 0, 0, 0 },
{ 0, 0, 0, 0 },
};
EnDinofos* this = THIS;
s32 i;
ColliderJntSphElementDim* dim;
@@ -1433,7 +1440,6 @@ void func_8089DC84(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s*
static s8 D_8089E3B0[] = {
-1, -1, 0, -1, 1, 2, -1, 3, 4, -1, 5, 6, -1, 7, 8, -1, 9, 10, -1, 11, -1,
};
EnDinofos* this = THIS;
Vec3f sp80;
Vec3f sp74;
src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
+972 -89
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h
+26 -4
View File
@@ -8,10 +8,32 @@ struct EnDodongo;
typedef void (*EnDodongoActionFunc)(struct EnDodongo*, GlobalContext*);
typedef struct EnDodongo {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x1B8];
/* 0x02FC */ EnDodongoActionFunc actionFunc;
/* 0x0300 */ char unk_300[0x514];
/* 0x000 */ Actor actor;
/* 0x144 */ SkelAnime skelAnime;
/* 0x188 */ Vec3s jointTable[31];
/* 0x242 */ Vec3s morphTable[31];
/* 0x2FC */ EnDodongoActionFunc actionFunc;
/* 0x300 */ u8 unk_300;
/* 0x302 */ s16 timer;
/* 0x304 */ s16 unk_304;
/* 0x306 */ s16 unk_306;
/* 0x308 */ Vec3f unk_308;
/* 0x314 */ Vec3f unk_314;
/* 0x320 */ Vec3f unk_320;
/* 0x32C */ Color_RGBA8 unk_32C;
/* 0x330 */ Color_RGBA8 unk_330;
/* 0x334 */ f32 unk_334;
/* 0x338 */ s32 unk_338;
/* 0x33C */ f32 unk_33C;
/* 0x340 */ f32 unk_340;
/* 0x344 */ f32 unk_344;
/* 0x348 */ Vec3f unk_348[9];
/* 0x3B4 */ ColliderJntSph collider1;
/* 0x3D4 */ ColliderJntSphElement collider1Elements[10];
/* 0x654 */ ColliderJntSph collider2;
/* 0x674 */ ColliderJntSphElement collider2Elements[3];
/* 0x734 */ ColliderJntSph collider3;
/* 0x754 */ ColliderJntSphElement collider3Elements[3];
} EnDodongo; // size = 0x814
extern const ActorInit En_Dodongo_InitVars;