mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-09-07 02:59:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

En_Dg (#233)

Browse Source 
* En_Dg

* Macros & Anim struct

* NBS

* PR

* PR

* Sort funcs/externs
This commit is contained in:
Maide
2021-08-08 22:10:31 +01:00
committed by GitHub
parent a0896b0895
commit 9dd5821669
6 changed files with 1139 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_Dg/z_en_dg.c
+1101 -69
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Dg/z_en_dg.h
+24 -4
View File
@@ -5,12 +5,32 @@
struct EnDg;
typedef void (*EnDgActionFunc)(struct EnDg* this, GlobalContext* globalCtx);
typedef void (*EnDgActionFunc)(struct EnDg*, GlobalContext*);
#define ENDG_GET_FC00(thisx) (((thisx)->params & 0xFC00) >> 0xA)
#define ENDG_GET_3E0(thisx) (((thisx)->params & 0x3E0) >> 5)
typedef struct EnDg {
/* 0x0000 */ Actor actor;
/* 0x0144 */ EnDgActionFunc actionFunc;
/* 0x0148 */ char unk_144[0x158];
/* 0x000 */ Actor actor;
/* 0x144 */ EnDgActionFunc actionFunc;
/* 0x148 */ UNK_TYPE1 unk_148[0x4];
/* 0x14C */ SkelAnime skelAnime;
/* 0x190 */ ColliderCylinder collider;
/* 0x1DC */ Path* unk_1DC;
/* 0x1E0 */ s32 unk_1E0;
/* 0x1E4 */ Vec3s jointTable[13];
/* 0x232 */ Vec3s morphTable[13];
/* 0x280 */ u16 unk_280;
/* 0x282 */ s16 unk_282;
/* 0x284 */ s16 unk_284;
/* 0x286 */ s16 unk_286;
/* 0x288 */ s16 unk_288;
/* 0x28A */ s16 unk_28A;
/* 0x28C */ s16 unk_28C;
/* 0x28E */ s16 unk_28E;
/* 0x290 */ s16 unk_290;
/* 0x292 */ s16 unk_292;
/* 0x294 */ Vec3f unk_294;
} EnDg; // size = 0x2A0
extern const ActorInit En_Dg_InitVars;
src/overlays/actors/ovl_En_Suttari/z_en_suttari.c
+2 -1
View File
@@ -202,7 +202,8 @@ void EnSuttari_UpdateTime(void) {
s32 func_80BAA904(EnSuttari* this, GlobalContext* globalCtx) {
Vec3f sp2C;
Vec3s sp24;
s32 pad;
s32 sp24;
sp2C.x = (Math_SinS(this->actor.world.rot.y) * 50.0f) + this->actor.world.pos.x;
sp2C.y = this->actor.world.pos.y + 100.0f;