En_Sellnuts (#264)

* En_Sellnuts

* a
This commit is contained in:
Maide 2021-09-19 15:39:39 +01:00 committed by GitHub
parent 3c779d7fd5
commit 9312fe4d11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 1135 additions and 54 deletions

3
spec
View File

@ -3693,8 +3693,7 @@ beginseg
name "ovl_En_Sellnuts"
compress
include "build/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.o"
include "build/data/ovl_En_Sellnuts/ovl_En_Sellnuts.data.o"
include "build/data/ovl_En_Sellnuts/ovl_En_Sellnuts.reloc.o"
include "build/src/overlays/actors/ovl_En_Sellnuts/ovl_En_Sellnuts_reloc.o"
endseg
beginseg

File diff suppressed because it is too large Load Diff

View File

@ -7,11 +7,43 @@ struct EnSellnuts;
typedef void (*EnSellnutsActionFunc)(struct EnSellnuts*, GlobalContext*);
#define ENSELLNUTS_GET_1(thisx) ((thisx)->params & 1)
#define ENSELLNUTS_GET_FC00(thisx) (((thisx)->params & 0xFC00) >> 0xA)
typedef struct EnSellnuts {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x194];
/* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ Vec3s jointTable[28];
/* 0x0230 */ Vec3s morphTable[28];
/* 0x02D8 */ EnSellnutsActionFunc actionFunc;
/* 0x02DC */ char unk_2DC[0x9C];
/* 0x02DC */ ColliderCylinder collider;
/* 0x0328 */ s16 unk_328;
/* 0x032C */ f32 unk_32C;
/* 0x0330 */ Path* path;
/* 0x0334 */ s32 unk_334;
/* 0x0338 */ u16 unk_338;
/* 0x033A */ u16 unk_33A;
/* 0x033C */ s16 cutscene;
/* 0x033E */ UNK_TYPE1 unk33E[0x2];
/* 0x0340 */ u16 unk_340;
/* 0x0342 */ u16 unk_342;
/* 0x0344 */ s16 unk_344;
/* 0x0346 */ UNK_TYPE1 unk346[0x4];
/* 0x034A */ s16 unk_34A;
/* 0x034C */ s16 unk_34C;
/* 0x034E */ s16 unk_34E;
/* 0x0350 */ s16 unk_350;
/* 0x0354 */ f32 unk_354;
/* 0x0358 */ f32 unk_358;
/* 0x035C */ f32 unk_35C;
/* 0x0360 */ f32 unk_360;
/* 0x0364 */ s16 unk_364;
/* 0x0366 */ s16 unk_366;
/* 0x0368 */ s16 unk_368;
/* 0x036A */ UNK_TYPE1 unk36A[0x2];
/* 0x036C */ f32 unk_36C;
/* 0x0370 */ f32 unk_370;
/* 0x0374 */ f32 unk_374;
} EnSellnuts; // size = 0x378
extern const ActorInit En_Sellnuts_InitVars;

View File

@ -3273,6 +3273,23 @@ D_06001350 = 0x06001350;
D_06005488 = 0x06005488;
D_06008290 = 0x06008290;
D_0600AC70 = 0x0600AC70;
D_06000994 = 0x06000994;
D_060012F4 = 0x060012F4;
D_06001BC8 = 0x06001BC8;
D_06001E2C = 0x06001E2C;
D_06002268 = 0x06002268;
D_06002670 = 0x06002670;
D_060029E8 = 0x060029E8;
D_06002F08 = 0x06002F08;
D_06003438 = 0x06003438;
D_060038CC = 0x060038CC;
D_06003CC0 = 0x06003CC0;
D_06004700 = 0x06004700;
D_06004AA0 = 0x06004AA0;
D_06004E38 = 0x06004E38;
D_0600577C = 0x0600577C;
D_06005CA8 = 0x06005CA8;
D_0600B0B4 = 0x0600B0B4;
// ovl_En_Shn