mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-26 22:32:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

ovl_En_Kaizoku OK (#945)

Browse Source 
* ovl_En_Kaizoku OK

* format.sh

* Review changes

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>

* Fix building

* first pass

* picto

* format

* object

* sfx

* morecleanup

* and more naming

* boyo

* Update src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* review

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* Review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* floats

* steal some docs from OoT

* review

* format

* sort

* parens

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
Co-authored-by: angie <angheloalf95@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
This commit is contained in:
Synray
2022-11-03 17:42:27 -07:00
committed by GitHub
parent 38c9ffe445
commit baaa79b979
9 changed files with 2211 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c
+2076 -97
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.h
+83 -4
View File
@@ -2,19 +2,98 @@
#define Z_EN_KAIZOKU_H
#include "global.h"
#include "z64snap.h"
#include "objects/object_kz/object_kz.h"
#define KAIZOKU_GET_EXIT_INDEX(thisx) ((thisx)->params & 0x3F)
#define KAIZOKU_GET_SWITCHFLAG(thisx) (((thisx)->params >> 6) & 0x7F)
struct EnKaizoku;
typedef void (*EnKaizokuActionFunc)(struct EnKaizoku*, PlayState*);
typedef enum EnKaizokuAnimation {
/* 0 */ EN_KAIZOKU_ANIM_0,
/* 1 */ EN_KAIZOKU_ANIM_1,
/* 2 */ EN_KAIZOKU_ANIM_2,
/* 3 */ EN_KAIZOKU_ANIM_3,
/* 4 */ EN_KAIZOKU_ANIM_4,
/* 5 */ EN_KAIZOKU_ANIM_5,
/* 6 */ EN_KAIZOKU_ANIM_6,
/* 7 */ EN_KAIZOKU_ANIM_7,
/* 8 */ EN_KAIZOKU_ANIM_8,
/* 9 */ EN_KAIZOKU_ANIM_9,
/* 10 */ EN_KAIZOKU_ANIM_10,
/* 11 */ EN_KAIZOKU_ANIM_11,
/* 12 */ EN_KAIZOKU_ANIM_12,
/* 13 */ EN_KAIZOKU_ANIM_13,
/* 14 */ EN_KAIZOKU_ANIM_14,
/* 15 */ EN_KAIZOKU_ANIM_15,
/* 16 */ EN_KAIZOKU_ANIM_16,
/* 17 */ EN_KAIZOKU_ANIM_17,
/* 18 */ EN_KAIZOKU_ANIM_18,
/* 19 */ EN_KAIZOKU_ANIM_MAX
} EnKaizokuAnimation;
typedef struct EnKaizoku {
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0x168];
/* 0x000 */ PictoActor picto;
/* 0x148 */ SkelAnime skelAnime;
/* 0x18C */ Vec3s jointTable[KAIZOKU_LIMB_MAX];
/* 0x21C */ Vec3s morphTable[KAIZOKU_LIMB_MAX];
/* 0x2AC */ EnKaizokuActionFunc actionFunc;
/* 0x2B0 */ char unk_2B0[0x40];
/* 0x2B0 */ s16 action;
/* 0x2B2 */ s16 unk_2B2;
/* 0x2B4 */ s16 lookTimer;
/* 0x2B6 */ s16 unk_2B6;
/* 0x2B8 */ s16 unk_2B8;
/* 0x2BA */ s16 drawDmgEffType;
/* 0x2BC */ s16 switchFlag;
/* 0x2BE */ s16 unk_2BE;
/* 0x2C0 */ f32 drawDmgEffScale;
/* 0x2C4 */ f32 drawDmgEffFrozenSteamScale;
/* 0x2C8 */ s16 unk_2C8;
/* 0x2CA */ s16 unk_2CA;
/* 0x2CC */ s16 eyeIndex;
/* 0x2CE */ s16 blinkTimer;
/* 0x2D0 */ s16 unk_2D0;
/* 0x2D2 */ s16 swordState;
/* 0x2D4 */ s16 exitIndex;
/* 0x2D6 */ s16 unk_2D6;
/* 0x2D8 */ u8 unk_2D8;
/* 0x2D9 */ u8 unk_2D9;
/* 0x2DC */ f32 frameCount;
/* 0x2E0 */ f32 unk_2E0;
/* 0x2E4 */ EnKaizokuAnimation animIndex;
/* 0x2E8 */ s32 bodyPartsPosIndex;
/* 0x2EC */ s32 unk_2EC;
/* 0x2F0 */ f32 unk_2F0;
/* 0x2F4 */ s16 unk_2F4;
/* 0x2F6 */ char unk_2F6[0x2FA];
/* 0x2F8 */ Vec3f unk_2F8;
/* 0x304 */ Vec3f unk_304;
/* 0x310 */ Vec3f bodyPartsPos[15];
/* 0x3C4 */ Vec3f unk_3C4;
/* 0x3D0 */ s32 blureIndex;
/* 0x3D4 */ ColliderCylinder bodyCollider;
/* 0x420 */ ColliderQuad swordCollider;
/* 0x4A0 */ ColliderTris blockCollider; // Unused. Inferred from OoT
/* 0x4C0 */ ColliderTrisElement blockElements[2]; // Unused. Inferred from OoT
/* 0x578 */ Vec3s headRot;
/* 0x580 */ Vec3f rightFootPos;
/* 0x58C */ Vec3f leftFootPos;
/* 0x598 */ s32 unk_598;
/* 0x59C */ s16 unk_59C;
/* 0x59E */ s16 subCamId;
/* 0x5A0 */ s16 unk_5A0;
/* 0x5A2 */ s16 unk_5A2;
/* 0x5A4 */ Vec3f subCamEye;
/* 0x5B0 */ Vec3f subCamAt;
/* 0x5BC */ Vec3f subCamUp;
/* 0x5C8 */ Vec3f unk_5C8;
/* 0x5D4 */ Vec3f unk_5D4;
/* 0x5E0 */ f32 unk_5E0;
/* 0x5E4 */ f32 unk_5E4;
/* 0x5E8 */ f32 unk_5E8;
/* 0x5EC */ f32 unk_5EC;
} EnKaizoku; // size = 0x5F0
#endif // Z_EN_KAIZOKU_H
src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c
+1 -1
View File
@@ -82,7 +82,7 @@ void ObjBoyo_UpdatePlayerBumpValues(ObjBoyo* this, Player* target) {
void ObjBoyo_UpdatePirateBumpValues(ObjBoyo* src, EnKaizoku* target) {
target->unk_2F0 = 30.0f;
target->unk_2F4 = Actor_YawBetweenActors(&src->actor, &target->actor);
target->unk_2F4 = Actor_YawBetweenActors(&src->actor, &target->picto.actor);
}
void ObjBoyo_UpdateBombBumpValues(ObjBoyo* src, EnBom* target) {