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

En_Fu (#343)

Browse Source 
* En_Fu

* Fix non-matching, thanks Anon58
This commit is contained in:
Maide
2021-10-11 20:48:03 +01:00
committed by GitHub
parent d2ce39d24b
commit 94e6ebaec9
11 changed files with 1449 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.h
+2 -1
View File
@@ -7,7 +7,8 @@ struct BgFuMizu;
typedef struct BgFuMizu {
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0x20];
/* 0x144 */ char unk_144[0x1C];
/* 0x160 */ s16 unk_160;
} BgFuMizu; // size = 0x164
extern const ActorInit Bg_Fu_Mizu_InitVars;
src/overlays/actors/ovl_En_Fu/z_en_fu.c
+1392 -64
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Fu/z_en_fu.h
+39 -2
View File
@@ -7,11 +7,48 @@ struct EnFu;
typedef void (*EnFuActionFunc)(struct EnFu*, GlobalContext*);
#define ENFU_GET_FF00(thisx) (((thisx)->params >> 8) & 0xFF)
typedef struct {
/* 0x00 */ f32 unk_00;
/* 0x04 */ char unk_04[0x4];
/* 0x08 */ Vec3f unk_08;
/* 0x14 */ Vec3f unk_14;
/* 0x20 */ Vec3f unk_20;
/* 0x2C */ s16 unk_2C;
/* 0x2E */ char unk_2E[0x8];
/* 0x36 */ u8 unk_36;
/* 0x37 */ u8 unk_37;
} EnFuUnkStruct; // size = 0x38
typedef struct EnFu {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x90];
/* 0x0144 */ ColliderCylinder collider;
/* 0x0190 */ SkelAnime skelAnime;
/* 0x01D4 */ EnFuActionFunc actionFunc;
/* 0x01D8 */ char unk_1D8[0x37C];
/* 0x01D8 */ Vec3s jointTable[21];
/* 0x0256 */ Vec3s morphTable[21];
/* 0x02D4 */ BgFuMizu* unk_2D4;
/* 0x02D8 */ EnFuUnkStruct unk_2D8[10];
/* 0x0508 */ Vec3f unk_508;
/* 0x0514 */ Vec3f unk_514;
/* 0x0520 */ s32 unk_520;
/* 0x0524 */ s16 unk_524[3];
/* 0x052A */ s16 unk_52A[3];
/* 0x0530 */ char unk530[0x8];
/* 0x0538 */ Vec3s* unk_538;
/* 0x053C */ s16 unk_53C;
/* 0x053E */ s16 unk_53E;
/* 0x0540 */ s16 unk_540;
/* 0x0542 */ s16 unk_542;
/* 0x0544 */ s16 unk_544;
/* 0x0546 */ s16 unk_546;
/* 0x0548 */ s16 unk_548;
/* 0x054A */ s16 unk_54A;
/* 0x054C */ s16 unk_54C;
/* 0x054E */ s16 unk_54E;
/* 0x0550 */ s16 unk_550;
/* 0x0552 */ u16 unk_552;
} EnFu; // size = 0x554
extern const ActorInit En_Fu_InitVars;
src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.h
+2 -1
View File
@@ -11,7 +11,8 @@ typedef struct EnFuKago {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x18];
/* 0x015C */ EnFuKagoActionFunc actionFunc;
/* 0x0160 */ char unk_160[0x1E0];
/* 0x0160 */ char unk_160[0x1DC];
/* 0x033C */ s16 unk_33C;
} EnFuKago; // size = 0x340
extern const ActorInit En_Fu_Kago_InitVars;
src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.h
+2 -1
View File
@@ -11,7 +11,8 @@ typedef struct EnFuMato {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x18];
/* 0x015C */ EnFuMatoActionFunc actionFunc;
/* 0x0160 */ char unk_160[0x1AC];
/* 0x0160 */ char unk_160[0x1AA];
/* 0x030A */ s16 unk_30A;
} EnFuMato; // size = 0x30C
extern const ActorInit En_Fu_Mato_InitVars;
src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
+1 -1
View File
@@ -626,7 +626,7 @@ void func_809C7620(EnSyatekiMan* this, GlobalContext* globalCtx) {
case 0x3FD:
case 0x3FF:
if (this->unk_26A == 4U) {
if (this->unk_26A == 4) {
if (this->unk_284 == 0x3FD) {
func_801518B0(globalCtx, 0x3FE, &this->actor);
this->unk_284 = 0x3FE;