* En_Zow

* Matching

* PR
This commit is contained in:
Maide
2022-02-19 20:16:21 +00:00
committed by GitHub
parent 08acf42204
commit 9f5217c81f
5 changed files with 613 additions and 57 deletions
+1 -2
View File
@@ -4834,8 +4834,7 @@ beginseg
name "ovl_En_Zow"
compress
include "build/src/overlays/actors/ovl_En_Zow/z_en_zow.o"
include "build/data/ovl_En_Zow/ovl_En_Zow.data.o"
include "build/data/ovl_En_Zow/ovl_En_Zow.reloc.o"
include "build/src/overlays/actors/ovl_En_Zow/ovl_En_Zow_reloc.o"
endseg
beginseg
File diff suppressed because it is too large Load Diff
+27 -1
View File
@@ -7,9 +7,35 @@ struct EnZow;
typedef void (*EnZowActionFunc)(struct EnZow*, GlobalContext*);
#define ENZOW_GET_F(thisx) ((thisx)->params & 0xF)
#define ENZOW_F_1 1
typedef struct {
/* 0x00 */ u8 unk_00;
/* 0x04 */ f32 unk_04;
/* 0x08 */ f32 unk_08;
/* 0x0C */ UNK_TYPE1 unk_0C[0x3];
/* 0x0F */ u8 unk_0F;
/* 0x10 */ UNK_TYPE1 unk_10[0x4];
/* 0x14 */ Vec3f unk_14;
/* 0x20 */ Vec3f unk_20;
/* 0x2C */ Vec3f unk_2C;
} EnZowStruct; // size = 0x38
typedef struct EnZow {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x4D4];
/* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ ColliderCylinder collider;
/* 0x01D4 */ Vec3s jointTable[20];
/* 0x024C */ Vec3s morphTable[20];
/* 0x02C4 */ s16 unk_2C4;
/* 0x02C6 */ s16 unk_2C6;
/* 0x02C8 */ s16 unk_2C8;
/* 0x02CA */ u16 unk_2CA;
/* 0x02CC */ s16 unk_2CC;
/* 0x02CE */ s16 unk_2CE;
/* 0x02D0 */ EnZowStruct unk_2D0[15];
/* 0x0618 */ EnZowActionFunc actionFunc;
} EnZow; // size = 0x61C
+1 -3
View File
@@ -16049,9 +16049,7 @@
0x80BDDCF0:("D_80BDDCF0","UNK_TYPE1","",0x1),
0x80BDDD1C:("D_80BDDD1C","UNK_TYPE4","",0x4),
0x80BDDD28:("D_80BDDD28","UNK_TYPE4","",0x4),
0x80BDDD34:("D_80BDDD34","f32","",0x4),
0x80BDDD38:("D_80BDDD38","f32","",0x4),
0x80BDDD3C:("D_80BDDD3C","f32","",0x4),
0x80BDDD34:("D_80BDDD34","Vec3f","",0xC),
0x80BDDD40:("D_80BDDD40","UNK_TYPE1","",0x1),
0x80BDDD4C:("D_80BDDD4C","UNK_TYPE1","",0x1),
0x80BDDD58:("D_80BDDD58","UNK_TYPE4","",0x4),
-12
View File
@@ -2027,18 +2027,6 @@ D_06004FE4 = 0x06004FE4;
D_06005098 = 0x06005098;
D_06005250 = 0x06005250;
// ovl_En_Zow
D_060029F0 = 0x060029F0;
D_06002A50 = 0x06002A50;
D_06002BA0 = 0x06002BA0;
D_06002C10 = 0x06002C10;
D_06003610 = 0x06003610;
D_06004248 = 0x06004248;
D_0600D208 = 0x0600D208;
D_0600D220 = 0x0600D220;
D_0600D288 = 0x0600D288;
// ovl_Mir_Ray
D_06000168 = 0x06000168;