falso
/
oot
mirror of https://github.com/zeldaret/oot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

EnFloorMas wip

This commit is contained in:
KrimtonZ 2020-03-26 22:39:47 -05:00
parent 458593fcd7
commit eaeea9e07e
4 changed files with 1549 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/functions.h
View File

@ -184,7 +184,7 @@ void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3
// ? func_8002389C(?);
void func_80024F0C(UNK_TYPE);
void func_80026400(GlobalContext*, Color_RGBA8*, u8, s16);
// ? func_80026608(?);
void func_80026608(GlobalContext*);
void func_80026860(GlobalContext*, Color_RGBA8*, u8, s16);
// ? func_80026A6C(?);
GlobalContext* func_80026B00(void);
@ -1148,6 +1148,7 @@ void func_800A51E8(SkelAnime *skelAnime, u32 animation);
void func_800A5240(SkelAnime *skelAnime, u32 animation, f32 unk0);
void func_800A529C(SkelAnime *skelAnime, u32 animation, f32 unk0, Actor *actor);
// ? func_800A52F8(?);
void func_800A5384(SkelAnime* skelAnime, u32 animation, f32 arg2);
// ? func_800A54FC(?);
UNK_TYPE func_800A56C8(SkelAnime* skelAnime, f32 arg1);
// ? func_800A56F0(?);

6
include/z64.h
View File

@ -929,7 +929,9 @@ typedef struct GlobalContext
/* 0x11D30 */ s16 unk_11D30[2];
/* 0x11D34 */ u8 nbTransitionActors;
/* 0x11D38 */ TransitionActorEntry* transitionActorList;
/* 0x11D3C */ char unk_11D3C[0x1C];
/* 0x11D3C */ char unk_11D3C[0x10];
/* 0x11D4C */ void (*unk_11D4C)(struct GlobalContext*, Actor*);
/* 0x11D50 */ char unk_11D50[0x8];
/* 0x11D58 */ void (*unk_11D58)(struct GlobalContext*, s32);
/* 0x11D5C */ char unk_11D5C[0x4];
/* 0x11D60 */ MtxF mf_11D60;
@ -1011,7 +1013,7 @@ typedef struct
/* 0x03 */ char unk_03[0x01]; /* Probably Padding */
/* 0x04 */ u32 limbIndex;
/* 0x08 */ u32 animCurrent;
/* 0x0C */ char unk_0C[0x04];
/* 0x0C */ f32 unk_0C;
/* 0x10 */ f32 animFrameCount;
/* 0x14 */ f32 unk_14;
/* 0x18 */ f32 animCurrentFrame;

1578
src/overlays/actors/ovl_En_Floormas/z_en_floormas.c
View File

File diff suppressed because it is too large Load Diff

13
src/overlays/actors/ovl_En_Floormas/z_en_floormas.h
View File

@ -7,7 +7,18 @@
typedef struct
{
/* 0x0000 */ Actor actor;
/* 0x014C */ char unk_14C[0x1C8];
/* 0x014C */ SkelAnime skelAnime;
/* 0x018C */ char unk_18C[4];
/* 0x0190 */ ActorFunc actionFunc;
/* 0x0194 */ s16 unk_194;
/* 0x0196 */ s16 unk_196;
/* 0x0198 */ s16 unk_198;
/* 0x019A */ s16 unk_19A;
/* 0x019C */ s32 unk_19C;
/* 0x01A0 */ char unk_1A0[0x92];
/* 0x0232 */ s16 unk_232;
/* 0x0234 */ char unk_234[0x94];
/* 0x02C8 */ ColliderCylinderMain colCylinder;
} EnFloormas; // size = 0x0314
extern const ActorInit En_Floormas_InitVars;