mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-09-10 11:55:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

object_dno (Deku King) documented (#1126)

Browse Source
This commit is contained in:
Tom Overton
2022-10-16 15:14:15 -07:00
committed by GitHub
parent 92d93701a9
commit b570e0c98e
3 changed files with 127 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_Dnq/z_en_dnq.c
+22 -22
View File
@@ -8,7 +8,6 @@
*/
#include "z_en_dnq.h"
#include "objects/object_dno/object_dno.h"
#define FLAGS (ACTOR_FLAG_1 | ACTOR_FLAG_8)
@@ -61,26 +60,26 @@ static ColliderCylinderInit sCylinderInit = {
static CollisionCheckInfoInit2 sColChkInfoInit = { 1, 0, 0, 0, MASS_IMMOVABLE };
static AnimationInfoS sAnimationInfo[] = {
{ &object_dno_Anim_008328, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
{ &object_dno_Anim_008328, 1.0f, 0, -1, ANIMMODE_LOOP, -4 },
{ &object_dno_Anim_007528, 1.0f, 0, -1, ANIMMODE_ONCE, -4 },
{ &object_dno_Anim_0006F0, 1.0f, 0, -1, ANIMMODE_ONCE, 0 },
{ &object_dno_Anim_000BF8, 1.0f, 0, -1, ANIMMODE_LOOP, -4 },
{ &object_dno_Anim_002690, 0.0f, 0, -1, ANIMMODE_ONCE, 0 },
{ &object_dno_Anim_002690, 1.0f, 0, -1, ANIMMODE_ONCE, -4 },
{ &object_dno_Anim_003408, 1.0f, 0, -1, ANIMMODE_LOOP, -4 },
{ &object_dno_Anim_006984, 1.0f, 0, -1, ANIMMODE_ONCE, -4 },
{ &object_dno_Anim_005E18, 1.0f, 0, -1, ANIMMODE_ONCE, -4 },
{ &object_dno_Anim_005A14, 1.0f, 0, -1, ANIMMODE_ONCE, -4 },
{ &object_dno_Anim_005284, 1.0f, 0, -1, ANIMMODE_ONCE, -4 },
{ &object_dno_Anim_001AEC, 1.0f, 0, -1, ANIMMODE_ONCE, 0 },
{ &object_dno_Anim_001100, 1.0f, 0, -1, ANIMMODE_ONCE, 0 },
{ &object_dno_Anim_004EA0, 1.0f, 0, -1, ANIMMODE_LOOP, -4 },
{ &object_dno_Anim_00F504, 1.0f, 0, -1, ANIMMODE_LOOP, -4 },
{ &object_dno_Anim_0047B8, 1.0f, 0, -1, ANIMMODE_LOOP, -4 },
{ &object_dno_Anim_003DBC, 1.0f, 0, -1, ANIMMODE_ONCE, -4 },
{ &object_dno_Anim_005A14, 1.0f, 0, -1, ANIMMODE_LOOP, -4 },
{ &object_dno_Anim_003DBC, 1.0f, 0, -1, ANIMMODE_LOOP, -4 },
{ &gDekuKingIdleAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
{ &gDekuKingIdleAnim, 1.0f, 0, -1, ANIMMODE_LOOP, -4 },
{ &gDekuKingSurpriseAnim, 1.0f, 0, -1, ANIMMODE_ONCE, -4 },
{ &gDekuKingJumpedOnStartAnim, 1.0f, 0, -1, ANIMMODE_ONCE, 0 },
{ &gDekuKingJumpedOnLoopAnim, 1.0f, 0, -1, ANIMMODE_LOOP, -4 },
{ &gDekuKingJumpedOnEndAnim, 0.0f, 0, -1, ANIMMODE_ONCE, 0 },
{ &gDekuKingJumpedOnEndAnim, 1.0f, 0, -1, ANIMMODE_ONCE, -4 },
{ &gDekuKingLyingDownTwitchAnim, 1.0f, 0, -1, ANIMMODE_LOOP, -4 },
{ &gDekuKingWailLoopAnim, 1.0f, 0, -1, ANIMMODE_ONCE, -4 },
{ &gDekuKingFootStampStartAnim, 1.0f, 0, -1, ANIMMODE_ONCE, -4 },
{ &gDekuKingFootStampLoopAnim, 1.0f, 0, -1, ANIMMODE_ONCE, -4 },
{ &gDekuKingWailStartAnim, 1.0f, 0, -1, ANIMMODE_ONCE, -4 },
{ &gDekuKingMarchAnim, 1.0f, 0, -1, ANIMMODE_ONCE, 0 },
{ &gDekuKingSpinScepterAnim, 1.0f, 0, -1, ANIMMODE_ONCE, 0 },
{ &gDekuKingIntimidateAnim, 1.0f, 0, -1, ANIMMODE_LOOP, -4 },
{ &gDekuKingPointScepterAnim, 1.0f, 0, -1, ANIMMODE_LOOP, -4 },
{ &gDekuKingJumpAnim, 1.0f, 0, -1, ANIMMODE_LOOP, -4 },
{ &gDekuKingLaughAnim, 1.0f, 0, -1, ANIMMODE_ONCE, -4 },
{ &gDekuKingFootStampLoopAnim, 1.0f, 0, -1, ANIMMODE_LOOP, -4 },
{ &gDekuKingLaughAnim, 1.0f, 0, -1, ANIMMODE_LOOP, -4 },
};
s32 EnDnq_ValidatePictograph(PlayState* play, Actor* thisx) {
@@ -420,7 +419,8 @@ void EnDnq_Init(Actor* thisx, PlayState* play) {
EnDnq* this = THIS;
ActorShape_Init(&this->picto.actor.shape, 0.0f, NULL, 14.0f);
SkelAnime_InitFlex(play, &this->skelAnime, &object_dno_Skel_00EB48, NULL, this->jointTable, this->morphTable, 33);
SkelAnime_InitFlex(play, &this->skelAnime, &gDekuKingSkel, NULL, this->jointTable, this->morphTable,
DEKU_KING_LIMB_MAX);
this->unk_398 = -1;
func_80A5257C(this, 0);
Collider_InitAndSetCylinder(play, &this->collider, &this->picto.actor, &sCylinderInit);
src/overlays/actors/ovl_En_Dnq/z_en_dnq.h
+3 -2
View File
@@ -2,6 +2,7 @@
#define Z_EN_DNQ_H
#include "global.h"
#include "objects/object_dno/object_dno.h"
#include "z64snap.h"
struct EnDnq;
@@ -15,8 +16,8 @@ typedef struct EnDnq {
/* 0x190 */ ColliderCylinder collider;
/* 0x1DC */ u8 unk_1DC;
/* 0x1E0 */ s32 unk_1E0;
/* 0x1E4 */ Vec3s jointTable[33];
/* 0x2AA */ Vec3s morphTable[33];
/* 0x1E4 */ Vec3s jointTable[DEKU_KING_LIMB_MAX];
/* 0x2AA */ Vec3s morphTable[DEKU_KING_LIMB_MAX];
/* 0x370 */ Vec3f unk_370;
/* 0x37C */ u16 unk_37C;
/* 0x37E */ s16 unk_37E;