mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-08-07 02:05:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

EnPp (Hiploop) OK and documented, object_pp documented (#997)

Browse Source 
* EnPp OK

* Format

* Animation naming consistency

* Respond to jpburnett's review

* Animation name consistency
This commit is contained in:
Tom Overton
2022-08-09 17:44:07 -07:00
committed by GitHub
parent 1aaf0fbc7e
commit f4f0ce7523
7 changed files with 1805 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_Pp/z_en_pp.c
+1542 -95
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Pp/z_en_pp.h
+68 -2
View File
@@ -2,16 +2,82 @@
#define Z_EN_PP_H
#include "global.h"
#include "objects/object_pp/object_pp.h"
struct EnPp;
typedef void (*EnPpActionFunc)(struct EnPp*, PlayState*);
#define EN_PP_GET_TYPE(thisx) ((thisx)->params)
#define EN_PP_DOES_CHARGE_IN_STRAIGHT_LINES(thisx) (((thisx)->params >> 8) & 1)
#define EN_PP_GET_ATTACK_RANGE(thisx) ((thisx)->world.rot.z)
typedef enum {
/* 0 */ EN_PP_TYPE_MASKED,
/* 1 */ EN_PP_TYPE_NO_MASK,
/* 2 */ EN_PP_TYPE_UNMASKED,
/* 7 */ EN_PP_TYPE_BODY_PART_BASE = 7,
/* 8 */ EN_PP_TYPE_BODY_PART_BODY,
/* 10 */ EN_PP_TYPE_BODY_PART_FRONT_LEFT_LOWER_LEG = 10,
/* 13 */ EN_PP_TYPE_BODY_PART_FRONT_RIGHT_LOWER_LEG = 13,
/* 17 */ EN_PP_TYPE_BODY_PART_LEFT_WING_MIDDLE = 17,
/* 23 */ EN_PP_TYPE_BODY_PART_RIGHT_WING_MIDDLE = 23,
/* 26 */ EN_PP_TYPE_BODY_PART_CENTER_WING_MIDDLE = 26,
} EnPpType;
typedef struct EnPp {
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0x17C];
/* 0x144 */ SkelAnime skelAnime;
/* 0x188 */ Vec3s jointTable[HIPLOOP_LIMB_MAX];
/* 0x224 */ Vec3s morphTable[HIPLOOP_LIMB_MAX];
/* 0x2C0 */ EnPpActionFunc actionFunc;
/* 0x2C4 */ char unk_2C4[0x328];
/* 0x2C4 */ s16 chargesInStraightLines; // If false, the Hiploop will instead charge directly at the player.
/* 0x2C6 */ s16 deadBodyPartIndex;
/* 0x2C8 */ s16 action;
/* 0x2CA */ s16 timer;
/* 0x2CC */ s16 secondaryTimer;
/* 0x2C8 */ s16 hornColliderOn;
/* 0x2D0 */ s16 targetRotY;
/* 0x2D2 */ union {
s16 isCharging;
s16 hasDoneFirstRoar;
s16 hasLandedFromJump;
s16 maskDetachState;
} actionVar;
/* 0x2D4 */ s16 maskBounceRotationalVelocity; // Controls the speed that the Hiploop rotates to face the player when an attack bounces off the mask.
/* 0x2D6 */ s16 deadBodyPartsSpawnedCount;
/* 0x2D8 */ f32 endFrame;
/* 0x2DC */ f32 chargeAndBounceSpeed;
/* 0x2DC */ Vec3f ledgeCheckPos[3];
/* 0x304 */ Vec3f wallCheckPos;
/* 0x310 */ Vec3f backFootPos[2];
/* 0x328 */ Vec3f maskFlamesBasePos;
/* 0x334 */ Vec3f maskPos;
/* 0x340 */ Vec3f maskRot;
/* 0x34C */ Vec3f maskVelocity;
/* 0x358 */ Vec3f targetPos;
/* 0x364 */ Vec3f deadBodyPartPos;
/* 0x370 */ s32 deadBodyPartDrawDmgEffCount;
/* 0x374 */ Vec3f deadBodyPartDrawDmgEffPos[10];
/* 0x3EC */ Vec3s deadBodyPartRotationalVelocity;
/* 0x3F2 */ s16 drawDmgEffTimer;
/* 0x3F4 */ s16 drawDmgEffType;
/* 0x3F8 */ f32 drawDmgEffScale;
/* 0x3FC */ f32 drawDmgEffFrozenSteamScale;
/* 0x400 */ f32 attackRange;
/* 0x404 */ s32 hasBeenDamaged;
/* 0x408 */ Vec3f bodyPartsPos[11];
/* 0x48C */ s16 bodyPartsPosCount;
/* 0x490 */ f32 maskAccelY;
/* 0x494 */ ColliderJntSph maskCollider;
/* 0x4B4 */ ColliderJntSphElement maskColliderElements[1];
/* 0x4F4 */ ColliderJntSph bodyCollider;
/* 0x514 */ ColliderJntSphElement bodyColliderElements[1];
/* 0x554 */ ColliderQuad hornCollider;
/* 0x5D4 */ CollisionPoly* floorPolyForCircleShadow;
/* 0x5D8 */ s32 blureIndex;
/* 0x5DC */ s32 animIndex;
/* 0x5DC */ Vec3f damagedVelocity;
} EnPp; // size = 0x5EC
extern const ActorInit En_Pp_InitVars;