mirror of https://github.com/zeldaret/mm.git
ovl_En_Muto OK (#358)
* ovl_En_Muto OK * Address initial PR comments * Add heading to file * Address additional PR comments * Update ovl_En_Muto to new animation system
This commit is contained in:
Connor Anderson
GitHub
parent
bfd1ab28a6
commit
820d8b6270
3
spec
3
spec
|
|
@ -5004,8 +5004,7 @@ beginseg
|
|||
name "ovl_En_Muto"
|
||||
compress
|
||||
include "build/src/overlays/actors/ovl_En_Muto/z_en_muto.o"
|
||||
include "build/data/ovl_En_Muto/ovl_En_Muto.data.o"
|
||||
include "build/data/ovl_En_Muto/ovl_En_Muto.reloc.o"
|
||||
include "build/src/overlays/actors/ovl_En_Muto/ovl_En_Muto_reloc.o"
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
|
|
|
|||
|
|
@ -1,3 +1,9 @@
|
|||
/*
|
||||
* File: z_en_muto.c
|
||||
* Overlay: ovl_En_Muto
|
||||
* Description: Mutoh, leader of the carpenters
|
||||
*/
|
||||
|
||||
#include "z_en_muto.h"
|
||||
|
||||
#define FLAGS 0x00000009
|
||||
|
|
@ -9,10 +15,17 @@ void EnMuto_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
|||
void EnMuto_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void EnMuto_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
void func_80BE7DEC(EnMuto* this, GlobalContext* globalCtx);
|
||||
void func_80BE7FEC(EnMuto* this, GlobalContext* globalCtx);
|
||||
void EnMuto_ChangeAnim(EnMuto* this, s32 arg1);
|
||||
void EnMuto_SetHeadRotation(EnMuto* this);
|
||||
void EnMuto_SetupIdle(EnMuto* this);
|
||||
void EnMuto_Idle(EnMuto* this, GlobalContext* globalCtx);
|
||||
void EnMuto_SetupDialogue(EnMuto* this, GlobalContext* globalCtx);
|
||||
void EnMuto_InDialogue(EnMuto* this, GlobalContext* globalCtx);
|
||||
s32 EnMuto_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx);
|
||||
|
||||
extern AnimationHeader D_06000E50;
|
||||
extern FlexSkeletonHeader D_06007150;
|
||||
|
||||
#if 0
|
||||
const ActorInit En_Muto_InitVars = {
|
||||
ACTOR_EN_MUTO,
|
||||
ACTORCAT_NPC,
|
||||
|
|
@ -25,37 +38,266 @@ const ActorInit En_Muto_InitVars = {
|
|||
(ActorFunc)EnMuto_Draw,
|
||||
};
|
||||
|
||||
// static ColliderCylinderInit sCylinderInit = {
|
||||
static ColliderCylinderInit D_80BE841C = {
|
||||
{ COLTYPE_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_2, COLSHAPE_CYLINDER, },
|
||||
{ ELEMTYPE_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_NONE, OCELEM_ON, },
|
||||
static u16 sTextIds[] = { 0x2ABD, 0x2ABB, 0x0624, 0x0623, 0x2AC6 };
|
||||
|
||||
static ColliderCylinderInit sCylinderInit = {
|
||||
{
|
||||
COLTYPE_NONE,
|
||||
AT_NONE,
|
||||
AC_NONE,
|
||||
OC1_ON | OC1_TYPE_ALL,
|
||||
OC2_TYPE_2,
|
||||
COLSHAPE_CYLINDER,
|
||||
},
|
||||
{
|
||||
ELEMTYPE_UNK0,
|
||||
{ 0x00000000, 0x00, 0x00 },
|
||||
{ 0xF7CFFFFF, 0x00, 0x00 },
|
||||
TOUCH_NONE | TOUCH_SFX_NORMAL,
|
||||
BUMP_NONE,
|
||||
OCELEM_ON,
|
||||
},
|
||||
{ 20, 60, 0, { 0, 0, 0 } },
|
||||
};
|
||||
|
||||
#endif
|
||||
void EnMuto_Init(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnMuto* this = THIS;
|
||||
|
||||
extern ColliderCylinderInit D_80BE841C;
|
||||
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
|
||||
ActorShape_Init(&this->actor.shape, 0.0f, func_800B3FC0, 40.0f);
|
||||
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06007150, &D_06000E50, this->jointTable, this->morphTable, 17);
|
||||
|
||||
extern UNK_TYPE D_06000E50;
|
||||
this->isInMayorsRoom = this->actor.params;
|
||||
if (!this->isInMayorsRoom) {
|
||||
this->shouldSetHeadRotation = true;
|
||||
this->textIdIndex = 2;
|
||||
if (gSaveContext.weekEventReg[60] & 0x80) {
|
||||
this->textIdIndex = 3;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Muto/EnMuto_Init.s")
|
||||
if (gSaveContext.day != 3 || !gSaveContext.isNight) {
|
||||
Actor_MarkForDeath(&this->actor);
|
||||
}
|
||||
} else {
|
||||
this->collider.dim.radius = 30;
|
||||
this->collider.dim.height = 60;
|
||||
this->collider.dim.yShift = 0;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Muto/EnMuto_Destroy.s")
|
||||
if (gSaveContext.weekEventReg[63] & 0x80 || (gSaveContext.day == 3 && gSaveContext.isNight)) {
|
||||
Actor_MarkForDeath(&this->actor);
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Muto/func_80BE7C94.s")
|
||||
this->actor.targetMode = 6;
|
||||
this->actor.gravity = -3.0f;
|
||||
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
|
||||
EnMuto_SetupIdle(this);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Muto/func_80BE7D20.s")
|
||||
void EnMuto_Destroy(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnMuto* this = THIS;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Muto/func_80BE7DB4.s")
|
||||
Collider_DestroyCylinder(globalCtx, &this->collider);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Muto/func_80BE7DEC.s")
|
||||
void EnMuto_ChangeAnim(EnMuto* this, s32 animIndex) {
|
||||
static AnimationHeader* sAnimations[] = { &D_06000E50, &D_06000E50 };
|
||||
static u8 sAnimationModes[] = { 0, 2 };
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Muto/func_80BE7F88.s")
|
||||
this->animIndex = animIndex;
|
||||
this->frameIndex = Animation_GetLastFrame(&sAnimations[animIndex]->common);
|
||||
Animation_Change(&this->skelAnime, sAnimations[this->animIndex], 1.0f, 0.0f, this->frameIndex,
|
||||
sAnimationModes[this->animIndex], -4.0f);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Muto/func_80BE7FEC.s")
|
||||
void EnMuto_SetHeadRotation(EnMuto* this) {
|
||||
s32 yawRotToTarget = ABS_ALT(BINANG_SUB(this->yawTowardsTarget, this->actor.world.rot.y));
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Muto/EnMuto_Update.s")
|
||||
this->headRotTarget.y = 0;
|
||||
if (this->actor.xzDistToPlayer < 200.0f && yawRotToTarget < 0x4E20) {
|
||||
this->headRotTarget.y = BINANG_SUB(this->yawTowardsTarget, this->actor.world.rot.y);
|
||||
if (this->headRotTarget.y > 0x2710) {
|
||||
this->headRotTarget.y = 0x2710;
|
||||
} else if (this->headRotTarget.y < -0x2710) {
|
||||
this->headRotTarget.y = -0x2710;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Muto/func_80BE8328.s")
|
||||
void EnMuto_SetupIdle(EnMuto* this) {
|
||||
EnMuto_ChangeAnim(this, 0);
|
||||
this->isInDialogue = false;
|
||||
this->actionFunc = EnMuto_Idle;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Muto/EnMuto_Draw.s")
|
||||
void EnMuto_Idle(EnMuto* this, GlobalContext* globalCtx) {
|
||||
Player* player;
|
||||
this->actor.textId = sTextIds[this->textIdIndex];
|
||||
|
||||
if (!this->isInMayorsRoom && (player = GET_PLAYER(globalCtx))->transformation == PLAYER_FORM_DEKU) {
|
||||
if (!(gSaveContext.weekEventReg[0x58] & 8)) {
|
||||
this->actor.textId = 0x62C;
|
||||
} else {
|
||||
this->actor.textId = 0x62B;
|
||||
}
|
||||
}
|
||||
|
||||
if (1) {} // Needed to match
|
||||
|
||||
if (!this->isInMayorsRoom && Player_GetMask(globalCtx) == PLAYER_MASK_KAFEIS_MASK) {
|
||||
this->actor.textId = 0x2363;
|
||||
}
|
||||
|
||||
if (func_800B84D0(&this->actor, globalCtx)) {
|
||||
EnMuto_SetupDialogue(this, globalCtx);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!this->isInMayorsRoom) {
|
||||
s16 yawRotToPlayer = ABS_ALT(BINANG_SUB(this->actor.yawTowardsPlayer, this->actor.world.rot.y));
|
||||
|
||||
this->yawTowardsTarget = this->actor.yawTowardsPlayer;
|
||||
if (yawRotToPlayer > 0x2890) {
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
this->textIdIndex = 0;
|
||||
if (gSaveContext.weekEventReg[0x3C] & 8) {
|
||||
this->textIdIndex = 1;
|
||||
}
|
||||
if (Player_GetMask(globalCtx) == PLAYER_MASK_COUPLES_MASK) {
|
||||
this->textIdIndex = 4;
|
||||
}
|
||||
|
||||
if (this->cutsceneState == 1) {
|
||||
EnMuto_SetupDialogue(this, globalCtx);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
func_800B8614(&this->actor, globalCtx, 80.0f);
|
||||
}
|
||||
|
||||
void EnMuto_SetupDialogue(EnMuto* this, GlobalContext* globalCtx) {
|
||||
if (!this->isInMayorsRoom) {
|
||||
this->yawTowardsTarget = 0;
|
||||
}
|
||||
|
||||
if (this->targetActor != NULL) {
|
||||
this->shouldSetHeadRotation = true;
|
||||
this->cutsceneState = 1;
|
||||
func_800B86C8(this->targetActor, globalCtx, this->targetActor);
|
||||
}
|
||||
|
||||
this->isInDialogue = true;
|
||||
this->actionFunc = EnMuto_InDialogue;
|
||||
}
|
||||
|
||||
void EnMuto_InDialogue(EnMuto* this, GlobalContext* globalCtx) {
|
||||
if (!this->isInMayorsRoom) {
|
||||
this->yawTowardsTarget = this->actor.yawTowardsPlayer;
|
||||
if (func_80152498(&globalCtx->msgCtx) == 5 && func_80147624(globalCtx)) {
|
||||
func_801477B4(globalCtx);
|
||||
|
||||
if (this->actor.textId == 0x62C) {
|
||||
gSaveContext.weekEventReg[88] |= 8;
|
||||
}
|
||||
if (this->actor.textId == 0x624) {
|
||||
gSaveContext.weekEventReg[60] |= 0x80;
|
||||
}
|
||||
|
||||
this->textIdIndex = 3;
|
||||
|
||||
EnMuto_SetupIdle(this);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (this->targetActor == &this->actor) {
|
||||
this->yawTowardsTarget = this->actor.world.rot.y;
|
||||
if (this->skelAnime.playSpeed == 0.0f) {
|
||||
this->skelAnime.playSpeed = 1.0f;
|
||||
}
|
||||
} else {
|
||||
f32 frameIndex = this->skelAnime.curFrame;
|
||||
|
||||
this->yawTowardsTarget = Math_Vec3f_Yaw(&this->actor.world.pos, &this->targetActor->world.pos);
|
||||
if (this->frameIndex <= frameIndex) {
|
||||
this->skelAnime.playSpeed = 0.0f;
|
||||
}
|
||||
}
|
||||
|
||||
if (globalCtx->msgCtx.unk11F04 == 0x2AC6 || globalCtx->msgCtx.unk11F04 == 0x2AC7 ||
|
||||
globalCtx->msgCtx.unk11F04 == 0x2AC8) {
|
||||
this->skelAnime.playSpeed = 0.0f;
|
||||
this->yawTowardsTarget = this->actor.yawTowardsPlayer;
|
||||
this->skelAnime.curFrame = 30.0f;
|
||||
}
|
||||
if (globalCtx->msgCtx.unk11F04 == 0x2ACF) {
|
||||
this->skelAnime.playSpeed = 0.0f;
|
||||
}
|
||||
|
||||
if (this->cutsceneState == 2) {
|
||||
EnMuto_SetupIdle(this);
|
||||
}
|
||||
}
|
||||
|
||||
void EnMuto_Update(Actor* thisx, GlobalContext* globalCtx2) {
|
||||
GlobalContext* globalCtx = globalCtx2;
|
||||
EnMuto* this = THIS;
|
||||
|
||||
SkelAnime_Update(&this->skelAnime);
|
||||
|
||||
if (this->shouldSetHeadRotation) {
|
||||
EnMuto_SetHeadRotation(this);
|
||||
}
|
||||
|
||||
if (this->isInMayorsRoom && gSaveContext.day == 3 && gSaveContext.isNight) {
|
||||
Actor_MarkForDeath(&this->actor);
|
||||
return;
|
||||
}
|
||||
|
||||
this->actionFunc(this, globalCtx);
|
||||
|
||||
DECR(this->unusedCounter);
|
||||
|
||||
Actor_SetScale(&this->actor, 0.01f);
|
||||
this->actor.shape.rot.y = this->actor.world.rot.y;
|
||||
Actor_SetHeight(&this->actor, 60.0f);
|
||||
Actor_SetVelocityAndMoveYRotationAndGravity(&this->actor);
|
||||
|
||||
Math_SmoothStepToS(&this->headRot.y, this->headRotTarget.y, 1, 0xBB8, 0);
|
||||
Math_SmoothStepToS(&this->headRot.x, this->headRotTarget.x, 1, 0x3E8, 0);
|
||||
Math_SmoothStepToS(&this->waistRot.y, this->waistRotTarget.y, 1, 0xBB8, 0);
|
||||
|
||||
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 20.0f, 20.0f, 50.0f, 0x1DU);
|
||||
|
||||
this->actor.uncullZoneForward = 500.0f;
|
||||
|
||||
Collider_UpdateCylinder(&this->actor, &this->collider);
|
||||
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
|
||||
}
|
||||
|
||||
s32 EnMuto_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
|
||||
Actor* thisx) {
|
||||
EnMuto* this = THIS;
|
||||
|
||||
if (limbIndex == 1) {
|
||||
rot->x += this->waistRot.y;
|
||||
}
|
||||
|
||||
if (limbIndex == 15) {
|
||||
rot->x += this->headRot.y;
|
||||
rot->z += this->headRot.x;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
void EnMuto_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnMuto* this = THIS;
|
||||
|
||||
func_8012C28C(globalCtx->state.gfxCtx);
|
||||
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
|
||||
EnMuto_OverrideLimbDraw, NULL, &this->actor);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,9 +9,25 @@ typedef void (*EnMutoActionFunc)(struct EnMuto*, GlobalContext*);
|
|||
|
||||
typedef struct EnMuto {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x0144 */ char unk_144[0x110];
|
||||
/* 0x0144 */ SkelAnime skelAnime;
|
||||
/* 0x0188 */ Vec3s jointTable[17];
|
||||
/* 0x01EE */ Vec3s morphTable[17];
|
||||
/* 0x0254 */ EnMutoActionFunc actionFunc;
|
||||
/* 0x0258 */ char unk_258[0x88];
|
||||
/* 0x0258 */ Vec3s headRot;
|
||||
/* 0x025E */ Vec3s headRotTarget;
|
||||
/* 0x0262 */ Vec3s waistRot;
|
||||
/* 0x026A */ Vec3s waistRotTarget;
|
||||
/* 0x0270 */ s16 unusedCounter;
|
||||
/* 0x0274 */ f32 frameIndex;
|
||||
/* 0x0278 */ s16 isInDialogue;
|
||||
/* 0x027A */ s16 textIdIndex;
|
||||
/* 0x027C */ s16 yawTowardsTarget;
|
||||
/* 0x0280 */ s32 isInMayorsRoom;
|
||||
/* 0x0284 */ s32 shouldSetHeadRotation;
|
||||
/* 0x0288 */ Actor* targetActor;
|
||||
/* 0x028C */ s32 cutsceneState;
|
||||
/* 0x0290 */ s32 animIndex;
|
||||
/* 0x0294 */ ColliderCylinder collider;
|
||||
} EnMuto; // size = 0x2E0
|
||||
|
||||
extern const ActorInit En_Muto_InitVars;
|
||||
|
|
|
|||
Loading…
Reference in New Issue