mirror of
https://github.com/zeldaret/oot.git
synced 2024-11-25 01:34:18 +00:00
[Doc] actor En_Dodojr (Baby Dodongo) (#1311)
* doc baby dodongo * remove unnecessary prototypes * run formatter * comment for bug that dragorn noticed * use boolean return values * clearer conditional checks on boolean functions * rename bounceCounter -> counter * renaming suggestions from review * rename to EnDodojr_UpdateBounces per review * rename to SetupSwallowedBombEffects * rename to TryEatBomb * last rename hopefully
This commit is contained in:
krm01
GitHub
parent
0aaf858df5
commit
16e62d45be
2 changed files with 184 additions and 181 deletions
|
|
@ -15,21 +15,21 @@ void EnDodojr_Destroy(Actor* thisx, PlayState* play);
|
|||
void EnDodojr_Update(Actor* thisx, PlayState* play);
|
||||
void EnDodojr_Draw(Actor* thisx, PlayState* play);
|
||||
|
||||
void func_809F73AC(EnDodojr* this, PlayState* play);
|
||||
void func_809F7BE4(EnDodojr* this, PlayState* play);
|
||||
void func_809F74C4(EnDodojr* this, PlayState* play);
|
||||
void func_809F758C(EnDodojr* this, PlayState* play);
|
||||
void func_809F786C(EnDodojr* this, PlayState* play);
|
||||
void func_809F799C(EnDodojr* this, PlayState* play);
|
||||
void func_809F78EC(EnDodojr* this, PlayState* play);
|
||||
void func_809F773C(EnDodojr* this, PlayState* play);
|
||||
void func_809F77AC(EnDodojr* this, PlayState* play);
|
||||
void func_809F784C(EnDodojr* this, PlayState* play);
|
||||
void func_809F7AB8(EnDodojr* this, PlayState* play);
|
||||
void func_809F7A00(EnDodojr* this, PlayState* play);
|
||||
void func_809F7B3C(EnDodojr* this, PlayState* play);
|
||||
void func_809F7C48(EnDodojr* this, PlayState* play);
|
||||
void func_809F768C(EnDodojr* this, PlayState* play);
|
||||
void EnDodojr_WaitUnderground(EnDodojr* this, PlayState* play);
|
||||
void EnDodojr_DropItem(EnDodojr* this, PlayState* play);
|
||||
void EnDodojr_EmergeFromGround(EnDodojr* this, PlayState* play);
|
||||
void EnDodojr_CrawlTowardsTarget(EnDodojr* this, PlayState* play);
|
||||
void EnDodojr_StunnedBounce(EnDodojr* this, PlayState* play);
|
||||
void EnDodojr_JumpAttackBounce(EnDodojr* this, PlayState* play);
|
||||
void EnDodojr_Stunned(EnDodojr* this, PlayState* play);
|
||||
void EnDodojr_SwallowBomb(EnDodojr* this, PlayState* play);
|
||||
void EnDodojr_SwallowedBombDeathBounce(EnDodojr* this, PlayState* play);
|
||||
void EnDodojr_SwallowedBombDeathSequence(EnDodojr* this, PlayState* play);
|
||||
void EnDodojr_StandardDeathBounce(EnDodojr* this, PlayState* play);
|
||||
void EnDodojr_Despawn(EnDodojr* this, PlayState* play);
|
||||
void EnDodojr_DeathSequence(EnDodojr* this, PlayState* play);
|
||||
void EnDodojr_WaitFreezeFrames(EnDodojr* this, PlayState* play);
|
||||
void EnDodojr_EatBomb(EnDodojr* this, PlayState* play);
|
||||
|
||||
const ActorInit En_Dodojr_InitVars = {
|
||||
ACTOR_EN_DODOJR,
|
||||
|
|
@ -80,7 +80,7 @@ void EnDodojr_Init(Actor* thisx, PlayState* play) {
|
|||
|
||||
Actor_SetScale(&this->actor, 0.02f);
|
||||
|
||||
this->actionFunc = func_809F73AC;
|
||||
this->actionFunc = EnDodojr_WaitUnderground;
|
||||
}
|
||||
|
||||
void EnDodojr_Destroy(Actor* thisx, PlayState* play) {
|
||||
|
|
@ -89,12 +89,12 @@ void EnDodojr_Destroy(Actor* thisx, PlayState* play) {
|
|||
Collider_DestroyCylinder(play, &this->collider);
|
||||
}
|
||||
|
||||
void func_809F64D0(EnDodojr* this) {
|
||||
void EnDodojr_DoSwallowedBombEffects(EnDodojr* this) {
|
||||
Audio_PlayActorSfx2(&this->actor, NA_SE_IT_BOMB_EXPLOSION);
|
||||
Actor_SetColorFilter(&this->actor, 0x4000, 200, 0, 8);
|
||||
}
|
||||
|
||||
void func_809F6510(EnDodojr* this, PlayState* play, s32 count) {
|
||||
void EnDodojr_SpawnLargeDust(EnDodojr* this, PlayState* play, s32 count) {
|
||||
Color_RGBA8 prim = { 170, 130, 90, 255 };
|
||||
Color_RGBA8 env = { 100, 60, 20, 0 };
|
||||
Vec3f velocity = { 0.0f, 0.0f, 0.0f };
|
||||
|
|
@ -116,7 +116,7 @@ void func_809F6510(EnDodojr* this, PlayState* play, s32 count) {
|
|||
}
|
||||
}
|
||||
|
||||
void func_809F6730(EnDodojr* this, PlayState* play, Vec3f* arg2) {
|
||||
void EnDodojr_SpawnSmallDust(EnDodojr* this, PlayState* play, Vec3f* arg2) {
|
||||
Color_RGBA8 prim = { 170, 130, 90, 255 };
|
||||
Color_RGBA8 env = { 100, 60, 20, 0 };
|
||||
Vec3f velocity = { 0.0f, 0.0f, 0.0f };
|
||||
|
|
@ -135,32 +135,32 @@ void func_809F6730(EnDodojr* this, PlayState* play, Vec3f* arg2) {
|
|||
func_8002836C(play, &pos, &velocity, &accel, &prim, &env, 100, 60, 8);
|
||||
}
|
||||
|
||||
s32 func_809F68B0(EnDodojr* this, PlayState* play) {
|
||||
s32 EnDodojr_UpdateBounces(EnDodojr* this, PlayState* play) {
|
||||
if (this->actor.velocity.y >= 0.0f) {
|
||||
return 0;
|
||||
return false;
|
||||
}
|
||||
|
||||
if (this->unk_1FC == 0) {
|
||||
return 0;
|
||||
if (this->counter == 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) {
|
||||
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_M_GND);
|
||||
this->dustPos = this->actor.world.pos;
|
||||
func_809F6510(this, play, 10);
|
||||
this->actor.velocity.y = 10.0f / (4 - this->unk_1FC);
|
||||
this->unk_1FC--;
|
||||
EnDodojr_SpawnLargeDust(this, play, 10);
|
||||
this->actor.velocity.y = 10.0f / (4 - this->counter);
|
||||
this->counter--;
|
||||
|
||||
if (this->unk_1FC == 0) {
|
||||
if (this->counter == 0) {
|
||||
this->actor.velocity.y = 0.0f;
|
||||
return 1;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
return false;
|
||||
}
|
||||
|
||||
void func_809F6994(EnDodojr* this) {
|
||||
void EnDodojr_SetupCrawlTowardsTarget(EnDodojr* this) {
|
||||
f32 lastFrame = Animation_GetLastFrame(&object_dodojr_Anim_000860);
|
||||
|
||||
Animation_Change(&this->skelAnime, &object_dodojr_Anim_000860, 1.8f, 0.0f, lastFrame, ANIMMODE_LOOP_INTERP, -10.0f);
|
||||
|
|
@ -169,7 +169,7 @@ void func_809F6994(EnDodojr* this) {
|
|||
this->actor.gravity = -0.8f;
|
||||
}
|
||||
|
||||
void func_809F6A20(EnDodojr* this) {
|
||||
void EnDodojr_SetupFlipBounce(EnDodojr* this) {
|
||||
f32 lastFrame = Animation_GetLastFrame(&object_dodojr_Anim_0004A0);
|
||||
|
||||
Animation_Change(&this->skelAnime, &object_dodojr_Anim_0004A0, 1.0f, 0.0f, lastFrame, ANIMMODE_ONCE, -10.0f);
|
||||
|
|
@ -178,13 +178,13 @@ void func_809F6A20(EnDodojr* this) {
|
|||
this->actor.velocity.z = 0.0f;
|
||||
this->actor.gravity = -0.8f;
|
||||
|
||||
if (this->unk_1FC == 0) {
|
||||
this->unk_1FC = 3;
|
||||
if (this->counter == 0) {
|
||||
this->counter = 3;
|
||||
this->actor.velocity.y = 10.0f;
|
||||
}
|
||||
}
|
||||
|
||||
void func_809F6AC4(EnDodojr* this) {
|
||||
void EnDodojr_SetupSwallowedBombDeathSequence(EnDodojr* this) {
|
||||
f32 lastFrame = Animation_GetLastFrame(&object_dodojr_Anim_0005F0);
|
||||
|
||||
Animation_Change(&this->skelAnime, &object_dodojr_Anim_0005F0, 1.0f, 0.0f, lastFrame, ANIMMODE_LOOP, 0.0f);
|
||||
|
|
@ -192,26 +192,26 @@ void func_809F6AC4(EnDodojr* this) {
|
|||
this->actor.gravity = -0.8f;
|
||||
}
|
||||
|
||||
void func_809F6B38(EnDodojr* this) {
|
||||
void EnDodojr_SetupJumpAttackBounce(EnDodojr* this) {
|
||||
f32 lastFrame = Animation_GetLastFrame(&object_dodojr_Anim_000724);
|
||||
|
||||
Animation_Change(&this->skelAnime, &object_dodojr_Anim_000724, 1.0f, 0.0f, lastFrame, ANIMMODE_LOOP, -10.0f);
|
||||
this->actor.gravity = -0.8f;
|
||||
this->unk_1FC = 3;
|
||||
this->counter = 3;
|
||||
this->actor.velocity.y = 10.0f;
|
||||
}
|
||||
|
||||
void func_809F6BBC(EnDodojr* this) {
|
||||
void EnDodojr_SetupDespawn(EnDodojr* this) {
|
||||
this->actor.shape.shadowDraw = NULL;
|
||||
this->actor.flags &= ~ACTOR_FLAG_0;
|
||||
this->actor.home.pos = this->actor.world.pos;
|
||||
this->actor.speedXZ = 0.0f;
|
||||
this->actor.gravity = -0.8f;
|
||||
this->timer3 = 30;
|
||||
this->timer = 30;
|
||||
this->dustPos = this->actor.world.pos;
|
||||
}
|
||||
|
||||
void func_809F6C24(EnDodojr* this) {
|
||||
void EnDodojr_SetupEatBomb(EnDodojr* this) {
|
||||
Animation_Change(&this->skelAnime, &object_dodojr_Anim_000724, 1.0f, 8.0f, 12.0f, ANIMMODE_ONCE, 0.0f);
|
||||
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_M_EAT);
|
||||
this->actor.speedXZ = 0.0f;
|
||||
|
|
@ -220,10 +220,10 @@ void func_809F6C24(EnDodojr* this) {
|
|||
this->actor.gravity = -0.8f;
|
||||
}
|
||||
|
||||
s32 func_809F6CA4(EnDodojr* this, PlayState* play) {
|
||||
s32 EnDodojr_CheckNearbyBombs(EnDodojr* this, PlayState* play) {
|
||||
Actor* bomb;
|
||||
Vec3f unkVec = { 99999.0f, 99999.0f, 99999.0f };
|
||||
s32 retVar = 0;
|
||||
Vec3f maxBombRange = { 99999.0f, 99999.0f, 99999.0f };
|
||||
s32 foundBomb = false;
|
||||
f32 xDist;
|
||||
f32 yDist;
|
||||
f32 zDist;
|
||||
|
|
@ -246,140 +246,140 @@ s32 func_809F6CA4(EnDodojr* this, PlayState* play) {
|
|||
yDist = bomb->world.pos.y - this->actor.world.pos.y;
|
||||
zDist = bomb->world.pos.z - this->actor.world.pos.z;
|
||||
|
||||
if ((fabsf(xDist) >= fabsf(unkVec.x)) || (fabsf(yDist) >= fabsf(unkVec.y)) ||
|
||||
(fabsf(zDist) >= fabsf(unkVec.z))) {
|
||||
if ((fabsf(xDist) >= fabsf(maxBombRange.x)) || (fabsf(yDist) >= fabsf(maxBombRange.y)) ||
|
||||
(fabsf(zDist) >= fabsf(maxBombRange.z))) {
|
||||
bomb = bomb->next;
|
||||
continue;
|
||||
}
|
||||
|
||||
this->bomb = bomb;
|
||||
unkVec = bomb->world.pos;
|
||||
retVar = 1;
|
||||
maxBombRange = bomb->world.pos;
|
||||
foundBomb = true;
|
||||
bomb = bomb->next;
|
||||
}
|
||||
|
||||
return retVar;
|
||||
return foundBomb;
|
||||
}
|
||||
|
||||
s32 func_809F6DD0(EnDodojr* this) {
|
||||
s32 EnDodojr_TryEatBomb(EnDodojr* this) {
|
||||
if (this->bomb == NULL) {
|
||||
return 0;
|
||||
return false;
|
||||
} else if (this->bomb->parent != NULL) {
|
||||
return 0;
|
||||
return false;
|
||||
} else if (Math_Vec3f_DistXYZ(&this->actor.world.pos, &this->bomb->world.pos) > 30.0f) {
|
||||
return 0;
|
||||
return false;
|
||||
} else {
|
||||
this->bomb->parent = &this->actor;
|
||||
return 1;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
void func_809F6E54(EnDodojr* this, PlayState* play) {
|
||||
void EnDodojr_UpdateCrawl(EnDodojr* this, PlayState* play) {
|
||||
f32 angles[] = { 0.0f, 210.0f, 60.0f, 270.0f, 120.0f, 330.0f, 180.0f, 30.0f, 240.0f, 90.0f, 300.0f, 150.0f };
|
||||
s32 pad;
|
||||
Player* player = GET_PLAYER(play);
|
||||
Vec3f pos;
|
||||
Vec3f crawlTargetPos;
|
||||
s16 angleIndex;
|
||||
|
||||
if ((this->bomb == NULL) || (this->bomb->update == NULL) ||
|
||||
((this->bomb != NULL) && (this->bomb->parent != NULL))) {
|
||||
func_809F6CA4(this, play);
|
||||
EnDodojr_CheckNearbyBombs(this, play);
|
||||
}
|
||||
|
||||
if (this->bomb != NULL) {
|
||||
pos = this->bomb->world.pos;
|
||||
crawlTargetPos = this->bomb->world.pos;
|
||||
} else {
|
||||
pos = player->actor.world.pos;
|
||||
crawlTargetPos = player->actor.world.pos;
|
||||
}
|
||||
|
||||
if (Math_Vec3f_DistXYZ(&this->actor.world.pos, &pos) > 80.0f) {
|
||||
if (Math_Vec3f_DistXYZ(&this->actor.world.pos, &crawlTargetPos) > 80.0f) {
|
||||
angleIndex =
|
||||
(s16)(this->actor.home.pos.x + this->actor.home.pos.y + this->actor.home.pos.z + play->state.frames / 30) %
|
||||
12;
|
||||
angleIndex = ABS(angleIndex);
|
||||
pos.x += 80.0f * sinf(angles[angleIndex]);
|
||||
pos.z += 80.0f * cosf(angles[angleIndex]);
|
||||
crawlTargetPos.x += 80.0f * sinf(angles[angleIndex]);
|
||||
crawlTargetPos.z += 80.0f * cosf(angles[angleIndex]);
|
||||
}
|
||||
|
||||
Math_SmoothStepToS(&this->actor.world.rot.y, Math_Vec3f_Yaw(&this->actor.world.pos, &pos), 10, 1000, 1);
|
||||
Math_SmoothStepToS(&this->actor.world.rot.y, Math_Vec3f_Yaw(&this->actor.world.pos, &crawlTargetPos), 10, 1000, 1);
|
||||
this->actor.shape.rot.y = this->actor.world.rot.y;
|
||||
}
|
||||
|
||||
s32 func_809F706C(EnDodojr* this) {
|
||||
s32 EnDodojr_IsPlayerWithinAttackRange(EnDodojr* this) {
|
||||
if (this->actor.xzDistToPlayer > 40.0f) {
|
||||
return 0;
|
||||
return false;
|
||||
} else {
|
||||
return 1;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
void func_809F709C(EnDodojr* this) {
|
||||
void EnDodojr_SetupStandardDeathBounce(EnDodojr* this) {
|
||||
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_M_DEAD);
|
||||
this->actor.flags &= ~ACTOR_FLAG_0;
|
||||
func_809F6A20(this);
|
||||
this->actionFunc = func_809F7AB8;
|
||||
EnDodojr_SetupFlipBounce(this);
|
||||
this->actionFunc = EnDodojr_StandardDeathBounce;
|
||||
}
|
||||
|
||||
s32 func_809F70E8(EnDodojr* this, PlayState* play) {
|
||||
if ((this->actionFunc == func_809F773C) || (this->actionFunc == func_809F77AC) ||
|
||||
(this->actionFunc == func_809F784C) || (this->actionFunc == func_809F7A00) ||
|
||||
(this->actionFunc == func_809F7AB8) || (this->actionFunc == func_809F7B3C) ||
|
||||
(this->actionFunc == func_809F7BE4)) {
|
||||
return 0;
|
||||
s32 EnDodojr_CheckDamaged(EnDodojr* this, PlayState* play) {
|
||||
if ((this->actionFunc == EnDodojr_SwallowBomb) || (this->actionFunc == EnDodojr_SwallowedBombDeathBounce) ||
|
||||
(this->actionFunc == EnDodojr_SwallowedBombDeathSequence) || (this->actionFunc == EnDodojr_Despawn) ||
|
||||
(this->actionFunc == EnDodojr_StandardDeathBounce) || (this->actionFunc == EnDodojr_DeathSequence) ||
|
||||
(this->actionFunc == EnDodojr_DropItem)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (play->actorCtx.unk_02 != 0) {
|
||||
if (this->actionFunc != func_809F73AC) {
|
||||
if (this->actionFunc == func_809F74C4) {
|
||||
if (this->actionFunc != EnDodojr_WaitUnderground) {
|
||||
if (this->actionFunc == EnDodojr_EmergeFromGround) {
|
||||
this->actor.shape.shadowDraw = ActorShadow_DrawCircle;
|
||||
}
|
||||
|
||||
func_809F709C(this);
|
||||
EnDodojr_SetupStandardDeathBounce(this);
|
||||
}
|
||||
return 0;
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!(this->collider.base.acFlags & AC_HIT)) {
|
||||
return 0;
|
||||
return false;
|
||||
} else {
|
||||
this->collider.base.acFlags &= ~AC_HIT;
|
||||
|
||||
if ((this->actionFunc == func_809F73AC) || (this->actionFunc == func_809F74C4)) {
|
||||
if ((this->actionFunc == EnDodojr_WaitUnderground) || (this->actionFunc == EnDodojr_EmergeFromGround)) {
|
||||
this->actor.shape.shadowDraw = ActorShadow_DrawCircle;
|
||||
}
|
||||
|
||||
if ((this->actor.colChkInfo.damageEffect == 0) && (this->actor.colChkInfo.damage != 0)) {
|
||||
Enemy_StartFinishingBlow(play, &this->actor);
|
||||
this->timer2 = 2;
|
||||
this->actionFunc = func_809F7C48;
|
||||
return 1;
|
||||
this->freezeFrameTimer = 2;
|
||||
this->actionFunc = EnDodojr_WaitFreezeFrames;
|
||||
return true;
|
||||
}
|
||||
|
||||
if ((this->actor.colChkInfo.damageEffect == 1) && (this->actionFunc != func_809F78EC) &&
|
||||
(this->actionFunc != func_809F786C)) {
|
||||
if ((this->actor.colChkInfo.damageEffect == 1) && (this->actionFunc != EnDodojr_Stunned) &&
|
||||
(this->actionFunc != EnDodojr_StunnedBounce)) {
|
||||
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE);
|
||||
this->timer1 = 120;
|
||||
this->stunTimer = 120;
|
||||
Actor_SetColorFilter(&this->actor, 0, 200, 0, 120);
|
||||
func_809F6A20(this);
|
||||
this->actionFunc = func_809F786C;
|
||||
EnDodojr_SetupFlipBounce(this);
|
||||
this->actionFunc = EnDodojr_StunnedBounce;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
void func_809F72A4(EnDodojr* this, PlayState* play) {
|
||||
void EnDodojr_UpdateCollider(EnDodojr* this, PlayState* play) {
|
||||
Collider_UpdateCylinder(&this->actor, &this->collider);
|
||||
|
||||
if ((this->actionFunc != func_809F73AC) && (this->actionFunc != func_809F7BE4)) {
|
||||
if ((this->actionFunc == func_809F74C4) || (this->actionFunc == func_809F758C) ||
|
||||
(this->actionFunc == func_809F799C)) {
|
||||
if ((this->actionFunc != EnDodojr_WaitUnderground) && (this->actionFunc != EnDodojr_DropItem)) {
|
||||
if ((this->actionFunc == EnDodojr_EmergeFromGround) || (this->actionFunc == EnDodojr_CrawlTowardsTarget) ||
|
||||
(this->actionFunc == EnDodojr_JumpAttackBounce)) {
|
||||
CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider.base);
|
||||
}
|
||||
|
||||
if ((this->actionFunc == func_809F74C4) || (this->actionFunc == func_809F758C) ||
|
||||
(this->actionFunc == func_809F786C) || (this->actionFunc == func_809F78EC) ||
|
||||
(this->actionFunc == func_809F799C)) {
|
||||
if ((this->actionFunc == EnDodojr_EmergeFromGround) || (this->actionFunc == EnDodojr_CrawlTowardsTarget) ||
|
||||
(this->actionFunc == EnDodojr_StunnedBounce) || (this->actionFunc == EnDodojr_Stunned) ||
|
||||
(this->actionFunc == EnDodojr_JumpAttackBounce)) {
|
||||
CollisionCheck_SetAC(play, &play->colChkCtx, &this->collider.base);
|
||||
}
|
||||
|
||||
|
|
@ -387,7 +387,7 @@ void func_809F72A4(EnDodojr* this, PlayState* play) {
|
|||
}
|
||||
}
|
||||
|
||||
void func_809F73AC(EnDodojr* this, PlayState* play) {
|
||||
void EnDodojr_WaitUnderground(EnDodojr* this, PlayState* play) {
|
||||
f32 lastFrame = Animation_GetLastFrame(&object_dodojr_Anim_000860);
|
||||
Player* player = GET_PLAYER(play);
|
||||
f32 dist;
|
||||
|
|
@ -404,60 +404,61 @@ void func_809F73AC(EnDodojr* this, PlayState* play) {
|
|||
this->actor.world.rot.x -= 0x4000;
|
||||
this->actor.shape.rot.x = this->actor.world.rot.x;
|
||||
this->dustPos = this->actor.world.pos;
|
||||
//! @bug floorHeight is always 0 at this point, so the dust is consistently drawn at y=0
|
||||
this->dustPos.y = this->actor.floorHeight;
|
||||
this->actionFunc = func_809F74C4;
|
||||
this->actionFunc = EnDodojr_EmergeFromGround;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void func_809F74C4(EnDodojr* this, PlayState* play) {
|
||||
void EnDodojr_EmergeFromGround(EnDodojr* this, PlayState* play) {
|
||||
f32 sp2C;
|
||||
|
||||
Math_SmoothStepToS(&this->actor.shape.rot.x, 0, 4, 0x3E8, 0x64);
|
||||
sp2C = this->actor.shape.rot.x;
|
||||
sp2C /= 16384.0f;
|
||||
this->actor.world.pos.y = this->actor.home.pos.y + (60.0f * sp2C);
|
||||
func_809F6510(this, play, 3);
|
||||
EnDodojr_SpawnLargeDust(this, play, 3);
|
||||
|
||||
if (sp2C == 0.0f) {
|
||||
this->actor.shape.shadowDraw = ActorShadow_DrawCircle;
|
||||
this->actor.world.rot.x = this->actor.shape.rot.x;
|
||||
this->actor.speedXZ = 2.6f;
|
||||
this->actionFunc = func_809F758C;
|
||||
this->actionFunc = EnDodojr_CrawlTowardsTarget;
|
||||
}
|
||||
}
|
||||
|
||||
void func_809F758C(EnDodojr* this, PlayState* play) {
|
||||
void EnDodojr_CrawlTowardsTarget(EnDodojr* this, PlayState* play) {
|
||||
func_8002D868(&this->actor);
|
||||
func_809F6730(this, play, &this->actor.world.pos);
|
||||
EnDodojr_SpawnSmallDust(this, play, &this->actor.world.pos);
|
||||
|
||||
if (DECR(this->timer4) == 0) {
|
||||
if (DECR(this->crawlSfxTimer) == 0) {
|
||||
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_M_MOVE);
|
||||
this->timer4 = 5;
|
||||
this->crawlSfxTimer = 5;
|
||||
}
|
||||
|
||||
if (func_809F6DD0(this) != 0) {
|
||||
func_809F6C24(this);
|
||||
this->actionFunc = func_809F768C;
|
||||
if (EnDodojr_TryEatBomb(this)) {
|
||||
EnDodojr_SetupEatBomb(this);
|
||||
this->actionFunc = EnDodojr_EatBomb;
|
||||
return;
|
||||
}
|
||||
|
||||
func_809F6E54(this, play);
|
||||
EnDodojr_UpdateCrawl(this, play);
|
||||
|
||||
if (func_809F706C(this) != 0) {
|
||||
if (EnDodojr_IsPlayerWithinAttackRange(this)) {
|
||||
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_M_CRY);
|
||||
func_809F6B38(this);
|
||||
this->actionFunc = func_809F799C;
|
||||
EnDodojr_SetupJumpAttackBounce(this);
|
||||
this->actionFunc = EnDodojr_JumpAttackBounce;
|
||||
}
|
||||
|
||||
if (this->actor.bgCheckFlags & BGCHECKFLAG_WALL) {
|
||||
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_M_DOWN);
|
||||
func_809F6BBC(this);
|
||||
this->actionFunc = func_809F7A00;
|
||||
EnDodojr_SetupDespawn(this);
|
||||
this->actionFunc = EnDodojr_Despawn;
|
||||
}
|
||||
}
|
||||
|
||||
void func_809F768C(EnDodojr* this, PlayState* play) {
|
||||
void EnDodojr_EatBomb(EnDodojr* this, PlayState* play) {
|
||||
EnBom* bomb;
|
||||
|
||||
if (((s16)this->skelAnime.curFrame - 8) < 4) {
|
||||
|
|
@ -467,55 +468,57 @@ void func_809F768C(EnDodojr* this, PlayState* play) {
|
|||
} else {
|
||||
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_DODO_K_DRINK);
|
||||
Actor_Kill(this->bomb);
|
||||
this->timer3 = 24;
|
||||
this->unk_1FC = 0;
|
||||
this->actionFunc = func_809F773C;
|
||||
this->timer = 24;
|
||||
this->counter = 0;
|
||||
this->actionFunc = EnDodojr_SwallowBomb;
|
||||
}
|
||||
}
|
||||
|
||||
void func_809F773C(EnDodojr* this, PlayState* play) {
|
||||
if (DECR(this->timer3) == 0) {
|
||||
func_809F64D0(this);
|
||||
void EnDodojr_SwallowBomb(EnDodojr* this, PlayState* play) {
|
||||
if (DECR(this->timer) == 0) {
|
||||
EnDodojr_DoSwallowedBombEffects(this);
|
||||
this->actor.flags &= ~ACTOR_FLAG_0;
|
||||
func_809F6A20(this);
|
||||
this->actionFunc = func_809F77AC;
|
||||
EnDodojr_SetupFlipBounce(this);
|
||||
this->actionFunc = EnDodojr_SwallowedBombDeathBounce;
|
||||
}
|
||||
}
|
||||
|
||||
void func_809F77AC(EnDodojr* this, PlayState* play) {
|
||||
void EnDodojr_SwallowedBombDeathBounce(EnDodojr* this, PlayState* play) {
|
||||
// Scale up briefly to expand from the swallowed bomb exploding.
|
||||
this->rootScale = 1.2f;
|
||||
this->rootScale *= ((f32)this->actor.colorFilterTimer / 8);
|
||||
func_8002D868(&this->actor);
|
||||
|
||||
if (func_809F68B0(this, play) != 0) {
|
||||
this->timer3 = 60;
|
||||
func_809F6AC4(this);
|
||||
this->unk_1FC = 7;
|
||||
this->actionFunc = func_809F784C;
|
||||
if (EnDodojr_UpdateBounces(this, play)) {
|
||||
this->timer = 60;
|
||||
EnDodojr_SetupSwallowedBombDeathSequence(this);
|
||||
this->counter = 7;
|
||||
this->actionFunc = EnDodojr_SwallowedBombDeathSequence;
|
||||
}
|
||||
}
|
||||
|
||||
void func_809F784C(EnDodojr* this, PlayState* play) {
|
||||
func_809F7B3C(this, play);
|
||||
void EnDodojr_SwallowedBombDeathSequence(EnDodojr* this, PlayState* play) {
|
||||
EnDodojr_DeathSequence(this, play);
|
||||
}
|
||||
|
||||
void func_809F786C(EnDodojr* this, PlayState* play) {
|
||||
void EnDodojr_StunnedBounce(EnDodojr* this, PlayState* play) {
|
||||
func_8002D868(&this->actor);
|
||||
|
||||
if (func_809F68B0(this, play) != 0) {
|
||||
func_809F6AC4(this);
|
||||
this->actionFunc = func_809F78EC;
|
||||
if (EnDodojr_UpdateBounces(this, play)) {
|
||||
EnDodojr_SetupSwallowedBombDeathSequence(this);
|
||||
this->actionFunc = EnDodojr_Stunned;
|
||||
}
|
||||
|
||||
Math_SmoothStepToS(&this->actor.shape.rot.y, 0, 4, 1000, 10);
|
||||
this->actor.world.rot.x = this->actor.shape.rot.x;
|
||||
this->actor.colorFilterTimer = this->timer1;
|
||||
this->actor.colorFilterTimer = this->stunTimer;
|
||||
}
|
||||
|
||||
void func_809F78EC(EnDodojr* this, PlayState* play) {
|
||||
if (DECR(this->timer1) != 0) {
|
||||
if (this->timer1 < 30) {
|
||||
if ((this->timer1 & 1) != 0) {
|
||||
void EnDodojr_Stunned(EnDodojr* this, PlayState* play) {
|
||||
if (DECR(this->stunTimer) != 0) {
|
||||
if (this->stunTimer < 30) {
|
||||
// Shake back and forth to indicate recovering from stun.
|
||||
if ((this->stunTimer & 1) != 0) {
|
||||
this->actor.world.pos.x += 1.5f;
|
||||
this->actor.world.pos.z += 1.5f;
|
||||
} else {
|
||||
|
|
@ -526,56 +529,56 @@ void func_809F78EC(EnDodojr* this, PlayState* play) {
|
|||
return;
|
||||
}
|
||||
} else {
|
||||
func_809F6994(this);
|
||||
this->actionFunc = func_809F758C;
|
||||
EnDodojr_SetupCrawlTowardsTarget(this);
|
||||
this->actionFunc = EnDodojr_CrawlTowardsTarget;
|
||||
}
|
||||
}
|
||||
|
||||
void func_809F799C(EnDodojr* this, PlayState* play) {
|
||||
void EnDodojr_JumpAttackBounce(EnDodojr* this, PlayState* play) {
|
||||
this->actor.flags |= ACTOR_FLAG_24;
|
||||
func_8002D868(&this->actor);
|
||||
|
||||
if (func_809F68B0(this, play) != 0) {
|
||||
func_809F6994(this);
|
||||
this->actionFunc = func_809F758C;
|
||||
if (EnDodojr_UpdateBounces(this, play)) {
|
||||
EnDodojr_SetupCrawlTowardsTarget(this);
|
||||
this->actionFunc = EnDodojr_CrawlTowardsTarget;
|
||||
}
|
||||
}
|
||||
|
||||
void func_809F7A00(EnDodojr* this, PlayState* play) {
|
||||
f32 tmp;
|
||||
void EnDodojr_Despawn(EnDodojr* this, PlayState* play) {
|
||||
f32 burrowStep;
|
||||
|
||||
Math_SmoothStepToS(&this->actor.shape.rot.x, 0x4000, 4, 1000, 100);
|
||||
|
||||
if (DECR(this->timer3) != 0) {
|
||||
tmp = (30 - this->timer3) / 30.0f;
|
||||
this->actor.world.pos.y = this->actor.home.pos.y - (60.0f * tmp);
|
||||
if (DECR(this->timer) != 0) {
|
||||
burrowStep = (30 - this->timer) / 30.0f;
|
||||
this->actor.world.pos.y = this->actor.home.pos.y - (60.0f * burrowStep);
|
||||
} else {
|
||||
Actor_Kill(&this->actor);
|
||||
}
|
||||
|
||||
func_809F6510(this, play, 3);
|
||||
EnDodojr_SpawnLargeDust(this, play, 3);
|
||||
}
|
||||
|
||||
void func_809F7AB8(EnDodojr* this, PlayState* play) {
|
||||
void EnDodojr_StandardDeathBounce(EnDodojr* this, PlayState* play) {
|
||||
func_8002D868(&this->actor);
|
||||
Math_SmoothStepToS(&this->actor.shape.rot.y, 0, 4, 1000, 10);
|
||||
this->actor.world.rot.x = this->actor.shape.rot.x;
|
||||
|
||||
if (func_809F68B0(this, play) != 0) {
|
||||
this->timer3 = 60;
|
||||
func_809F6AC4(this);
|
||||
this->unk_1FC = 7;
|
||||
this->actionFunc = func_809F7B3C;
|
||||
if (EnDodojr_UpdateBounces(this, play)) {
|
||||
this->timer = 60;
|
||||
EnDodojr_SetupSwallowedBombDeathSequence(this);
|
||||
this->counter = 7;
|
||||
this->actionFunc = EnDodojr_DeathSequence;
|
||||
}
|
||||
}
|
||||
|
||||
void func_809F7B3C(EnDodojr* this, PlayState* play) {
|
||||
void EnDodojr_DeathSequence(EnDodojr* this, PlayState* play) {
|
||||
EnBom* bomb;
|
||||
|
||||
if (this->unk_1FC != 0) {
|
||||
if (this->counter != 0) {
|
||||
if (this->actor.colorFilterTimer == 0) {
|
||||
Actor_SetColorFilter(&this->actor, 0x4000, 200, 0, this->unk_1FC);
|
||||
this->unk_1FC--;
|
||||
Actor_SetColorFilter(&this->actor, 0x4000, 200, 0, this->counter);
|
||||
this->counter--;
|
||||
}
|
||||
} else {
|
||||
bomb = (EnBom*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BOM, this->actor.world.pos.x,
|
||||
|
|
@ -585,21 +588,21 @@ void func_809F7B3C(EnDodojr* this, PlayState* play) {
|
|||
bomb->timer = 0;
|
||||
}
|
||||
|
||||
this->timer3 = 8;
|
||||
this->actionFunc = func_809F7BE4;
|
||||
this->timer = 8;
|
||||
this->actionFunc = EnDodojr_DropItem;
|
||||
}
|
||||
}
|
||||
|
||||
void func_809F7BE4(EnDodojr* this, PlayState* play) {
|
||||
if (DECR(this->timer3) == 0) {
|
||||
void EnDodojr_DropItem(EnDodojr* this, PlayState* play) {
|
||||
if (DECR(this->timer) == 0) {
|
||||
Item_DropCollectibleRandom(play, NULL, &this->actor.world.pos, 0x40);
|
||||
Actor_Kill(&this->actor);
|
||||
}
|
||||
}
|
||||
|
||||
void func_809F7C48(EnDodojr* this, PlayState* play) {
|
||||
if (DECR(this->timer2) == 0) {
|
||||
func_809F709C(this);
|
||||
void EnDodojr_WaitFreezeFrames(EnDodojr* this, PlayState* play) {
|
||||
if (DECR(this->freezeFrameTimer) == 0) {
|
||||
EnDodojr_SetupStandardDeathBounce(this);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -608,19 +611,19 @@ void EnDodojr_Update(Actor* thisx, PlayState* play) {
|
|||
|
||||
SkelAnime_Update(&this->skelAnime);
|
||||
Actor_MoveForward(&this->actor);
|
||||
func_809F70E8(this, play);
|
||||
EnDodojr_CheckDamaged(this, play);
|
||||
|
||||
if (this->actionFunc != func_809F73AC) {
|
||||
if (this->actionFunc != EnDodojr_WaitUnderground) {
|
||||
Actor_UpdateBgCheckInfo(play, &this->actor, this->collider.dim.radius, this->collider.dim.height, 0.0f,
|
||||
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2);
|
||||
}
|
||||
|
||||
this->actionFunc(this, play);
|
||||
Actor_SetFocus(&this->actor, 10.0f);
|
||||
func_809F72A4(this, play);
|
||||
EnDodojr_UpdateCollider(this, play);
|
||||
}
|
||||
|
||||
s32 func_809F7D50(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
|
||||
s32 EnDodojr_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
|
||||
EnDodojr* this = (EnDodojr*)thisx;
|
||||
Vec3f D_809F7F64 = { 480.0f, 620.0f, 0.0f };
|
||||
|
||||
|
|
@ -636,15 +639,15 @@ s32 func_809F7D50(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s
|
|||
return false;
|
||||
}
|
||||
|
||||
void func_809F7DFC(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
|
||||
void EnDodojr_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
|
||||
}
|
||||
|
||||
void EnDodojr_Draw(Actor* thisx, PlayState* play) {
|
||||
EnDodojr* this = (EnDodojr*)thisx;
|
||||
|
||||
if ((this->actionFunc != func_809F73AC) && (this->actionFunc != func_809F7BE4)) {
|
||||
if ((this->actionFunc != EnDodojr_WaitUnderground) && (this->actionFunc != EnDodojr_DropItem)) {
|
||||
Gfx_SetupDL_25Opa(play->state.gfxCtx);
|
||||
SkelAnime_DrawOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable, func_809F7D50, func_809F7DFC,
|
||||
&this->actor);
|
||||
SkelAnime_DrawOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable, EnDodojr_OverrideLimbDraw,
|
||||
EnDodojr_PostLimbDraw, &this->actor);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@ typedef struct EnDodojr {
|
|||
/* 0x01E0 */ Actor* bomb;
|
||||
/* 0x01E4 */ Vec3f headPos;
|
||||
/* 0x01F0 */ Vec3f dustPos;
|
||||
/* 0x01FC */ s16 unk_1FC;
|
||||
/* 0x01FE */ s16 timer1;
|
||||
/* 0x0200 */ s16 timer2;
|
||||
/* 0x0202 */ s16 timer3;
|
||||
/* 0x0204 */ s16 timer4;
|
||||
/* 0x01FC */ s16 counter; // Used for bouncing and flashing when dying.
|
||||
/* 0x01FE */ s16 stunTimer;
|
||||
/* 0x0200 */ s16 freezeFrameTimer;
|
||||
/* 0x0202 */ s16 timer; // Used for burrowing/despawning, bomb swallowing, and dying.
|
||||
/* 0x0204 */ s16 crawlSfxTimer;
|
||||
/* 0x0208 */ f32 rootScale; // scale used with the root limb
|
||||
/* 0x020C */ Vec3s jointTable[15];
|
||||
/* 0x0266 */ Vec3s morphTable[15];
|
||||
|
|
|
|||
Loading…
Reference in a new issue