mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-05 22:00:15 +00:00
Code Issues Projects Releases Wiki Activity

z_en_peehat (#660)

Browse source 
* decomp most of En_Peehat

* z_en_peehat code decomp'd and OK

* complete data migration

* first pass at documentation

* minor code clean-up

* documentation pass

* fix spec (hopefully), implement some of petrie's suggestions

* implement requested changes

* fix compiler warnings

* implement fig's changes

* implement roman's changes
This commit is contained in:
mzxrules 2021-02-21 09:25:53 -05:00 • committed by GitHub
parent 8022585465
commit bbbf657b4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
46 changed files with 1025 additions and 3834 deletions
Download patch file Download diff file Expand all files Collapse all files

1055
src/overlays/actors/ovl_En_Peehat/z_en_peehat.c
View file

File diff suppressed because it is too large Load diff

35
src/overlays/actors/ovl_En_Peehat/z_en_peehat.h
View file

@ -4,11 +4,44 @@
#include "ultra64.h"
#include "global.h"
typedef enum {
/* -1 */ PEAHAT_TYPE_GROUNDED = -1,
/* 0 */ PEAHAT_TYPE_FLYING = 0,
/* 1 */ PEAHAT_TYPE_LARVA = 1
} PeahatType;
struct EnPeehat;
typedef void (*EnPeehatActionFunc)(struct EnPeehat*, GlobalContext*);
typedef struct EnPeehat {
/* 0x0000 */ Actor actor;
/* 0x014C */ char unk_14C[0x2E0];
/* 0x014C */ SkelAnime skelAnime;
/* 0x0190 */ Vec3s jointTable[24];
/* 0x0220 */ Vec3s morphTable[24];
/* 0x02B0 */ s32 state;
/* 0x02B4 */ s32 isStateDieFirstUpdate;
/* 0x02B8 */ EnPeehatActionFunc actionFunc;
/* 0x02BC */ Vec3f bladeTip[2]; // used to simulate the peahat's blades "digging up" earth
/* 0x02D4 */ s32 unk2D4;
/* 0x02D8 */ f32 xzDistMax; // max xz dist to follow Link (PEAHAT_TYPE_GROUNDED) or spawn larva (PEAHAT_TYPE_FLYING)
/* 0x02DC */ f32 xzDistToRise; // xz dist needed to rise from the ground
/* 0x02E0 */ f32 unk2E0; // rot?
/* 0x02E4 */ f32 jiggleRot;
/* 0x02E8 */ f32 jiggleRotInc;
/* 0x02EC */ f32 scaleShift; // 0.0f for no distortion. used for "jiggle" effect when stabbed on ground
/* 0x02F0 */ s16 bladeRotVel; // spinning blades rotational velocity
/* 0x02F2 */ s16 bladeRot; // spinning blades rotation component
/* 0x02F4 */ s16 unk2F4;
/* 0x02F6 */ s16 riseDelayTimer; // countdown timer until peahat is allowed to rise up from the ground
/* 0x02F8 */ s16 seekPlayerTimer; // number of frames the peahat should seek the player before landing to rest
/* 0x02FA */ s16 unk2FA; // larva count (PEAHAT_TYPE_FLYING, PEAHAT_TYPE_GROUNDED),
// shape rotation direction (PEAHAT_TYPE_GROUNDED)
/* 0x02FC */ s16 animTimer;
/* 0x0300 */ ColliderCylinder colCylinder;
/* 0x034C */ ColliderJntSph colJntSph;
/* 0x036C */ ColliderJntSphElement colJntSphItemList[1];
/* 0x03AC */ ColliderQuad colQuad;
} EnPeehat; // size = 0x042C
extern const ActorInit En_Peehat_InitVars;