mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-06 06:10:21 +00:00
En_Ssh (House of Skulltula spiders) (#485)
* Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * eek spiders * now with names * fixes and formatting * expanded enum * void* limb draw
This commit is contained in:
petrie911
GitHub
parent
620e3418c7
commit
fd97e8433e
53 changed files with 840 additions and 2545 deletions
|
|
@ -4,12 +4,57 @@
|
|||
|
||||
#define THIS ((EnSsh*)thisx)
|
||||
|
||||
#define SSH_STATE_STUNNED (1 << 0)
|
||||
#define SSH_STATE_GROUND_START (1 << 2)
|
||||
#define SSH_STATE_ATTACKED (1 << 3)
|
||||
#define SSH_STATE_SPIN (1 << 4)
|
||||
|
||||
typedef enum {
|
||||
SSH_ANIM_UNK0, // Unused animation. Possibly being knocked back?
|
||||
SSH_ANIM_UP,
|
||||
SSH_ANIM_WAIT,
|
||||
SSH_ANIM_LAND,
|
||||
SSH_ANIM_DROP,
|
||||
SSH_ANIM_UNK5, // Slower version of ANIM_DROP
|
||||
SSH_ANIM_UNK6 // Faster repeating version of ANIM_UNK0
|
||||
} EnSshAnimation;
|
||||
|
||||
void EnSsh_Init(Actor* thisx, GlobalContext* globalCtx);
|
||||
void EnSsh_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
||||
void EnSsh_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void EnSsh_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
void EnSsh_Idle(EnSsh* this, GlobalContext* globalCtx);
|
||||
void EnSsh_Drop(EnSsh* this, GlobalContext* globalCtx);
|
||||
void EnSsh_Return(EnSsh* this, GlobalContext* globalCtx);
|
||||
void EnSsh_Start(EnSsh* this, GlobalContext* globalCtx);
|
||||
|
||||
extern AnimationHeader D_06000304;
|
||||
extern SkeletonHeader D_060052E0;
|
||||
extern Gfx D_060046C0[];
|
||||
extern Gfx D_06004080[];
|
||||
extern Gfx D_06004DE8[];
|
||||
|
||||
static Vtx D_80B043C0[] = {
|
||||
VTX(-1, 0, 0, 0, 1024, 0xFF, 0xFF, 0xFF, 0xFF),
|
||||
VTX(1, 0, 0, 1024, 1024, 0xFF, 0xFF, 0xFF, 0xFF),
|
||||
VTX(1, 100, 0, 1024, 0, 0xFF, 0xFF, 0xFF, 0xFF),
|
||||
VTX(-1, 100, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF),
|
||||
};
|
||||
|
||||
static Gfx D_80B04400[] = {
|
||||
gsDPPipeSync(),
|
||||
gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_OFF),
|
||||
gsDPSetCombineLERP(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, PRIMITIVE, 0, 0, 0, PRIMITIVE),
|
||||
gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2),
|
||||
gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR),
|
||||
gsDPSetPrimColor(0, 0, 255, 255, 255, 255),
|
||||
gsSPVertex(D_80B043C0, 4, 0),
|
||||
gsSP1Triangle(0, 1, 2, 0),
|
||||
gsSP1Triangle(0, 2, 3, 0),
|
||||
gsSPEndDisplayList(),
|
||||
};
|
||||
|
||||
const ActorInit En_Ssh_InitVars = {
|
||||
ACTOR_EN_SSH,
|
||||
ACTORTYPE_NPC,
|
||||
|
|
@ -21,95 +66,799 @@ const ActorInit En_Ssh_InitVars = {
|
|||
(ActorFunc)EnSsh_Update,
|
||||
(ActorFunc)EnSsh_Draw,
|
||||
};
|
||||
*/
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02270.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02278.s")
|
||||
static ColliderCylinderInit sCylinderInit1 = {
|
||||
{ COLTYPE_UNK6, 0x00, 0x09, 0x00, 0x10, COLSHAPE_CYLINDER },
|
||||
{ 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, 0x01, 0x01, 0x00 },
|
||||
{ 32, 50, -24, { 0, 0, 0 } },
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02300.s")
|
||||
static CollisionCheckInfoInit2 sColChkInfoInit = { 1, 0, 0, 0, 0xFF };
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B023FC.s")
|
||||
static ColliderCylinderInit sCylinderInit2 = {
|
||||
{ COLTYPE_UNK6, 0x00, 0x00, 0x39, 0x10, COLSHAPE_CYLINDER },
|
||||
{ 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, 0x00, 0x00, 0x01 },
|
||||
{ 20, 60, -30, { 0, 0, 0 } },
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02490.s")
|
||||
static ColliderJntSphItemInit sJntSphElementInit[1] = {
|
||||
{
|
||||
{ 0x00, { 0xFFCFFFFF, 0x00, 0x04 }, { 0x00000000, 0x00, 0x00 }, 0x01, 0x00, 0x01 },
|
||||
{ 1, { { 0, -240, 0 }, 28 }, 100 },
|
||||
},
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02598.s")
|
||||
static ColliderJntSphInit sJntSphInit = {
|
||||
{ COLTYPE_UNK6, 0x11, 0x00, 0x39, 0x10, COLSHAPE_JNTSPH },
|
||||
1,
|
||||
sJntSphElementInit,
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B025C0.s")
|
||||
void EnSsh_SetupAction(EnSsh* this, EnSshActionFunc actionFunc) {
|
||||
this->actionFunc = actionFunc;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02700.s")
|
||||
void EnSsh_SpawnShockwave(EnSsh* this, GlobalContext* globalCtx) {
|
||||
Vec3f zeroVec = { 0.0f, 0.0f, 0.0f };
|
||||
Vec3f pos;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02834.s")
|
||||
pos.x = this->actor.posRot.pos.x;
|
||||
pos.y = this->actor.groundY;
|
||||
pos.z = this->actor.posRot.pos.z;
|
||||
EffectSsBlast_SpawnWhiteCustomScale(globalCtx, &pos, &zeroVec, &zeroVec, 100, 220, 8);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02854.s")
|
||||
s32 EnSsh_CreateBlureEffect(GlobalContext* globalCtx) {
|
||||
EffectBlureInit1 blureInit;
|
||||
u8 p1StartColor[] = { 255, 255, 255, 75 };
|
||||
u8 p2StartColor[] = { 255, 255, 255, 75 };
|
||||
u8 p1EndColor[] = { 255, 255, 255, 0 };
|
||||
u8 p2EndColor[] = { 255, 255, 255, 0 };
|
||||
s32 i;
|
||||
s32 blureIdx;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02884.s")
|
||||
for (i = 0; i < 4; i++) {
|
||||
blureInit.p1StartColor[i] = p1StartColor[i];
|
||||
blureInit.p2StartColor[i] = p2StartColor[i];
|
||||
blureInit.p1EndColor[i] = p1EndColor[i];
|
||||
blureInit.p2EndColor[i] = p2EndColor[i];
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B028CC.s")
|
||||
blureInit.elemDuration = 6;
|
||||
blureInit.unkFlag = 0;
|
||||
blureInit.calcMode = 3;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02920.s")
|
||||
Effect_Add(globalCtx, &blureIdx, EFFECT_BLURE1, 0, 0, &blureInit);
|
||||
return blureIdx;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B0294C.s")
|
||||
s32 EnSsh_CheckCeilingPos(EnSsh* this, GlobalContext* globalCtx) {
|
||||
CollisionPoly* sp4C;
|
||||
u32 sp48;
|
||||
Vec3f sp3C;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02AC4.s")
|
||||
sp3C.x = this->actor.posRot.pos.x;
|
||||
sp3C.y = this->actor.posRot.pos.y + 1000.0f;
|
||||
sp3C.z = this->actor.posRot.pos.z;
|
||||
if (!func_8003DE84(&globalCtx->colCtx, &this->actor.posRot.pos, &sp3C, &this->ceilingPos, &sp4C, 0, 0, 1, 1,
|
||||
&sp48)) {
|
||||
return false;
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02B9C.s")
|
||||
void EnSsh_AddBlureVertex(EnSsh* this) {
|
||||
Vec3f p1base = { 834.0f, 834.0f, 0.0f };
|
||||
Vec3f p2base = { 834.0f, -584.0f, 0.0f };
|
||||
Vec3f p1;
|
||||
Vec3f p2;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02C74.s")
|
||||
p1base.x *= this->colliderScale;
|
||||
p1base.y *= this->colliderScale;
|
||||
p1base.z *= this->colliderScale;
|
||||
p2base.x *= this->colliderScale;
|
||||
p2base.y *= this->colliderScale;
|
||||
p2base.z *= this->colliderScale;
|
||||
Matrix_Push();
|
||||
Matrix_MultVec3f(&p1base, &p1);
|
||||
Matrix_MultVec3f(&p2base, &p2);
|
||||
Matrix_Pull();
|
||||
EffectBlure_AddVertex(Effect_GetByIndex(this->blureIdx), &p1, &p2);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02D14.s")
|
||||
void EnSsh_AddBlureSpace(EnSsh* this) {
|
||||
EffectBlure_AddSpace(Effect_GetByIndex(this->blureIdx));
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02D50.s")
|
||||
void EnSsh_InitColliders(EnSsh* this, GlobalContext* globalCtx) {
|
||||
ColliderCylinderInit* cylinders[6] = {
|
||||
&sCylinderInit1, &sCylinderInit1, &sCylinderInit1, &sCylinderInit2, &sCylinderInit2, &sCylinderInit2,
|
||||
};
|
||||
s32 i;
|
||||
s32 pad;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02DBC.s")
|
||||
for (i = 0; i < ARRAY_COUNT(cylinders); i++) {
|
||||
Collider_InitCylinder(globalCtx, &this->colCylinder[i]);
|
||||
Collider_SetCylinder(globalCtx, &this->colCylinder[i], &this->actor, cylinders[i]);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02EA4.s")
|
||||
this->colCylinder[0].body.bumper.flags = 0x0003F8E9;
|
||||
this->colCylinder[1].body.bumper.flags = 0xFFC00716;
|
||||
this->colCylinder[2].base.type = 9;
|
||||
this->colCylinder[2].body.bumperFlags = 0xD;
|
||||
this->colCylinder[2].body.flags = 2;
|
||||
this->colCylinder[2].body.bumper.flags = 0xFFCC0716;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02EDC.s")
|
||||
func_80061EFC(&this->actor.colChkInfo, DamageTable_Get(2), &sColChkInfoInit);
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02F1C.s")
|
||||
Collider_InitJntSph(globalCtx, &this->colSph);
|
||||
Collider_SetJntSph(globalCtx, &this->colSph, &this->actor, &sJntSphInit, this->colSphElements);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03060.s")
|
||||
f32 EnSsh_SetAnimation(EnSsh* this, s32 animIndex) {
|
||||
AnimationHeader* animation[] = {
|
||||
0x06005BE8, 0x06000304, 0x06000304, 0x060055F8, 0x06000304, 0x06000304, 0x06005BE8
|
||||
};
|
||||
f32 playbackSpeed[] = { 1.0f, 4.0f, 1.0f, 1.0f, 8.0f, 6.0f, 2.0f };
|
||||
u8 mode[] = { 3, 3, 1, 3, 1, 1, 1 };
|
||||
f32 frameCount = SkelAnime_GetFrameCount(&animation[animIndex]->genericHeader);
|
||||
s32 pad;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B030D4.s")
|
||||
SkelAnime_ChangeAnim(&this->skelAnime, animation[animIndex], playbackSpeed[animIndex], 0.0f, frameCount,
|
||||
mode[animIndex], -6.0f);
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B031DC.s")
|
||||
return frameCount;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03238.s")
|
||||
void EnSsh_SetWaitAnimation(EnSsh* this) {
|
||||
EnSsh_SetAnimation(this, SSH_ANIM_WAIT);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B0330C.s")
|
||||
void EnSsh_SetReturnAnimation(EnSsh* this) {
|
||||
Audio_PlayActorSound2(&this->actor, NA_SE_EN_STALTU_UP);
|
||||
EnSsh_SetAnimation(this, SSH_ANIM_UP);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B033BC.s")
|
||||
void EnSsh_SetLandAnimation(EnSsh* this) {
|
||||
this->actor.posRot.pos.y = this->groundYoffset + this->actor.groundY;
|
||||
this->animTimer = EnSsh_SetAnimation(this, SSH_ANIM_LAND);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03400.s")
|
||||
void EnSsh_SetDropAnimation(EnSsh* this) {
|
||||
if (this->unkTimer == 0) {
|
||||
this->animTimer = EnSsh_SetAnimation(this, SSH_ANIM_DROP);
|
||||
}
|
||||
this->actor.velocity.y = -10.0f;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B034B4.s")
|
||||
void EnSsh_SetStunned(EnSsh* this) {
|
||||
if (this->stunTimer == 0) {
|
||||
this->stateFlags |= SSH_STATE_ATTACKED;
|
||||
this->stunTimer = 120;
|
||||
this->actor.dmgEffectTimer = 0;
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B0368C.s")
|
||||
void EnSsh_SetColliderScale(EnSsh* this, f32 scale, f32 radiusMod) {
|
||||
f32 radius;
|
||||
f32 height;
|
||||
f32 yShift;
|
||||
s32 i;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Init.s")
|
||||
radius = this->colSph.list[0].dim.modelSphere.radius;
|
||||
radius *= scale;
|
||||
this->colSph.list[0].dim.modelSphere.radius = radius;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Destroy.s")
|
||||
for (i = 0; i < 6; i++) {
|
||||
yShift = this->colCylinder[i].dim.yShift;
|
||||
radius = this->colCylinder[i].dim.radius;
|
||||
height = this->colCylinder[i].dim.height;
|
||||
yShift *= scale;
|
||||
radius *= scale * radiusMod;
|
||||
height *= scale;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03968.s")
|
||||
this->colCylinder[i].dim.yShift = yShift;
|
||||
this->colCylinder[i].dim.radius = radius;
|
||||
this->colCylinder[i].dim.height = height;
|
||||
}
|
||||
Actor_SetScale(&this->actor, 0.04f * scale);
|
||||
this->groundYoffset = 40.0f * scale;
|
||||
this->colliderScale = scale * 1.5f;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B039BC.s")
|
||||
s32 EnSsh_Damaged(EnSsh* this) {
|
||||
if ((this->stunTimer == 120) && (this->stateFlags & SSH_STATE_STUNNED)) {
|
||||
func_8003426C(&this->actor, 0, 0xC8, 0, this->stunTimer);
|
||||
}
|
||||
if (DECR(this->stunTimer) != 0) {
|
||||
Math_SmoothScaleMaxMinS(&this->maxTurnRate, 0x2710, 0xA, 0x3E8, 1);
|
||||
return false;
|
||||
} else {
|
||||
this->stunTimer = 0;
|
||||
this->stateFlags &= ~SSH_STATE_STUNNED;
|
||||
this->spinTimer = 0;
|
||||
if (this->swayTimer == 0) {
|
||||
this->spinTimer = 30;
|
||||
}
|
||||
Audio_PlayActorSound2(&this->actor, NA_SE_EN_STALTU_ROLL);
|
||||
Audio_PlayActorSound2(&this->actor, NA_SE_VO_ST_ATTACK);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03A00.s")
|
||||
void EnSsh_Turn(EnSsh* this, GlobalContext* globalCtx) {
|
||||
if (this->hitTimer != 0) {
|
||||
this->hitTimer--;
|
||||
}
|
||||
if (DECR(this->spinTimer) != 0) {
|
||||
this->actor.posRot.rot.y += 10000.0f * (this->spinTimer / 30.0f);
|
||||
} else if ((this->swayTimer == 0) && (this->stunTimer == 0)) {
|
||||
Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 4, 0x2710, 1);
|
||||
}
|
||||
this->actor.shape.rot.y = this->actor.posRot.rot.y;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03C8C.s")
|
||||
void EnSsh_Stunned(EnSsh* this, GlobalContext* globalCtx) {
|
||||
if ((this->swayTimer == 0) && (this->stunTimer == 0)) {
|
||||
Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink ^ 0x8000, 4, this->maxTurnRate,
|
||||
1);
|
||||
}
|
||||
this->actor.shape.rot.y = this->actor.posRot.rot.y;
|
||||
if (this->stunTimer < 30) {
|
||||
if (this->stunTimer & 1) {
|
||||
this->actor.shape.rot.y += 0x7D0;
|
||||
} else {
|
||||
this->actor.shape.rot.y -= 0x7D0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03D74.s")
|
||||
void EnSsh_UpdateYaw(EnSsh* this, GlobalContext* globalCtx) {
|
||||
if (this->stunTimer != 0) {
|
||||
EnSsh_Stunned(this, globalCtx);
|
||||
} else {
|
||||
EnSsh_Turn(this, globalCtx);
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03E74.s")
|
||||
void EnSsh_Bob(EnSsh* this, GlobalContext* globalCtx) {
|
||||
f32 bobVel = 0.5f;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03F48.s")
|
||||
if ((globalCtx->state.frames & 8) != 0) {
|
||||
bobVel *= -1.0f;
|
||||
}
|
||||
Math_SmoothScaleMaxMinF(&this->actor.velocity.y, bobVel, 0.4f, 1000.0f, 0.0f);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03FF0.s")
|
||||
s32 EnSsh_IsCloseToLink(EnSsh* this, GlobalContext* globalCtx) {
|
||||
Player* player = PLAYER;
|
||||
f32 yDist;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Update.s")
|
||||
if (this->stateFlags & SSH_STATE_GROUND_START) {
|
||||
return true;
|
||||
}
|
||||
if (this->unkTimer != 0) {
|
||||
return true;
|
||||
}
|
||||
if (this->swayTimer != 0) {
|
||||
return true;
|
||||
}
|
||||
if (this->animTimer != 0) {
|
||||
return true;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B04190.s")
|
||||
if (this->actor.xzDistFromLink > 160.0f) {
|
||||
return false;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B04280.s")
|
||||
yDist = this->actor.posRot.pos.y - player->actor.posRot.pos.y;
|
||||
if (yDist < 0.0f || yDist > 400.0f) {
|
||||
return false;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Draw.s")
|
||||
if (player->actor.posRot.pos.y < this->actor.groundY) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
s32 EnSsh_IsCloseToHome(EnSsh* this) {
|
||||
f32 vel = this->actor.velocity.y;
|
||||
f32 nextY = this->actor.posRot.pos.y + 2.0f * this->actor.velocity.y;
|
||||
|
||||
if (nextY >= this->actor.initPosRot.pos.y) {
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
s32 EnSsh_IsCloseToGround(EnSsh* this) {
|
||||
f32 vel = this->actor.velocity.y;
|
||||
f32 nextY = this->actor.posRot.pos.y + 2.0f * this->actor.velocity.y;
|
||||
|
||||
if ((nextY - this->actor.groundY) <= this->groundYoffset) {
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
void EnSsh_Sway(EnSsh* this) {
|
||||
Vec3f swayVecBase;
|
||||
Vec3f swayVec;
|
||||
f32 temp;
|
||||
s16 swayAngle;
|
||||
|
||||
if (this->swayTimer != 0) {
|
||||
this->swayAngle += 0x640;
|
||||
this->swayTimer--;
|
||||
if (this->swayTimer == 0) {
|
||||
this->swayAngle = 0;
|
||||
}
|
||||
temp = this->swayTimer * (1.0f / 6);
|
||||
swayAngle = temp * (0x10000 / 360.0f) * Math_Sins(this->swayAngle);
|
||||
temp = this->actor.posRot.pos.y - this->ceilingPos.y;
|
||||
swayVecBase.x = Math_Sins(swayAngle) * temp;
|
||||
swayVecBase.y = Math_Coss(swayAngle) * temp;
|
||||
swayVecBase.z = 0.0f;
|
||||
Matrix_Push();
|
||||
Matrix_Translate(this->ceilingPos.x, this->ceilingPos.y, this->ceilingPos.z, MTXMODE_NEW);
|
||||
Matrix_RotateY(this->actor.posRot.rot.y * (M_PI / 0x8000), MTXMODE_APPLY);
|
||||
Matrix_MultVec3f(&swayVecBase, &swayVec);
|
||||
Matrix_Pull();
|
||||
this->actor.shape.rot.z = -(swayAngle * 2);
|
||||
this->actor.posRot.pos.x = swayVec.x;
|
||||
this->actor.posRot.pos.z = swayVec.z;
|
||||
}
|
||||
}
|
||||
|
||||
void EnSsh_CheckBodyStickHit(EnSsh* this, GlobalContext* globalCtx) {
|
||||
ColliderBody* body = &this->colCylinder[0].body;
|
||||
Player* player = PLAYER;
|
||||
|
||||
if (player->unk_860 != 0) {
|
||||
body->bumper.flags |= 2;
|
||||
this->colCylinder[1].body.bumper.flags &= ~2;
|
||||
this->colCylinder[2].body.bumper.flags &= ~2;
|
||||
} else {
|
||||
body->bumper.flags &= ~2;
|
||||
this->colCylinder[1].body.bumper.flags |= 2;
|
||||
this->colCylinder[2].body.bumper.flags |= 2;
|
||||
}
|
||||
}
|
||||
|
||||
s32 EnSsh_CheckHitLink(EnSsh* this, GlobalContext* globalCtx) {
|
||||
s32 i;
|
||||
s32 hit = false;
|
||||
|
||||
if ((this->hitCount == 0) && (this->spinTimer == 0)) {
|
||||
return false;
|
||||
}
|
||||
for (i = 0; i < 3; i++) {
|
||||
if (this->colCylinder[i + 3].base.maskB & 1) {
|
||||
this->colCylinder[i + 3].base.maskB &= ~1;
|
||||
hit = true;
|
||||
}
|
||||
}
|
||||
if (!hit) {
|
||||
return false;
|
||||
}
|
||||
this->hitTimer = 30;
|
||||
if (this->swayTimer == 0) {
|
||||
this->spinTimer = this->hitTimer;
|
||||
}
|
||||
Audio_PlayActorSound2(&this->actor, NA_SE_EN_STALTU_ROLL);
|
||||
Audio_PlayActorSound2(&this->actor, NA_SE_VO_ST_ATTACK);
|
||||
globalCtx->damagePlayer(globalCtx, -8);
|
||||
func_8002F71C(globalCtx, &this->actor, 4.0f, this->actor.yawTowardsLink, 6.0f);
|
||||
this->hitCount--;
|
||||
return true;
|
||||
}
|
||||
|
||||
s32 EnSsh_CheckHitFront(EnSsh* this) {
|
||||
u32 acFlags;
|
||||
|
||||
if (this->colCylinder[2].base.acFlags) {} // Needed for matching
|
||||
acFlags = this->colCylinder[2].base.acFlags;
|
||||
|
||||
if (!!(acFlags & 2) == 0) {
|
||||
return 0;
|
||||
} else {
|
||||
this->colCylinder[2].base.acFlags &= ~2;
|
||||
this->invincibilityTimer = 8;
|
||||
if ((this->swayTimer == 0) && (this->hitTimer == 0) && (this->stunTimer == 0)) {
|
||||
this->swayTimer = 60;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
s32 EnSsh_CheckHitBack(EnSsh* this, GlobalContext* globalCtx) {
|
||||
ColliderCylinder* cyl = &this->colCylinder[0];
|
||||
s32 hit = false;
|
||||
|
||||
if (cyl->base.acFlags & 2) {
|
||||
cyl->base.acFlags &= ~2;
|
||||
hit = true;
|
||||
}
|
||||
cyl = &this->colCylinder[1];
|
||||
if (cyl->base.acFlags & 2) {
|
||||
cyl->base.acFlags &= ~2;
|
||||
hit = true;
|
||||
}
|
||||
if (!hit) {
|
||||
return false;
|
||||
}
|
||||
this->invincibilityTimer = 8;
|
||||
if (this->hitCount <= 0) {
|
||||
this->hitCount++;
|
||||
}
|
||||
if (this->stunTimer == 0) {
|
||||
Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE);
|
||||
Audio_PlayActorSound2(&this->actor, NA_SE_VO_ST_DAMAGE);
|
||||
}
|
||||
EnSsh_SetStunned(this);
|
||||
this->stateFlags |= SSH_STATE_STUNNED;
|
||||
return false;
|
||||
}
|
||||
|
||||
s32 EnSsh_CollisionCheck(EnSsh* this, GlobalContext* globalCtx) {
|
||||
if (this->stunTimer == 0) {
|
||||
EnSsh_CheckHitLink(this, globalCtx);
|
||||
}
|
||||
if (EnSsh_CheckHitFront(this)) {
|
||||
return false;
|
||||
} else if (globalCtx->actorCtx.unk_02 != 0) {
|
||||
this->invincibilityTimer = 8;
|
||||
if (this->stunTimer == 0) {
|
||||
Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE);
|
||||
Audio_PlayActorSound2(&this->actor, NA_SE_VO_ST_DAMAGE);
|
||||
}
|
||||
EnSsh_SetStunned(this);
|
||||
this->stateFlags |= SSH_STATE_STUNNED;
|
||||
return false;
|
||||
} else {
|
||||
return EnSsh_CheckHitBack(this, globalCtx);
|
||||
// Always returns false
|
||||
}
|
||||
}
|
||||
|
||||
void EnSsh_SetBodyCylinderAC(EnSsh* this, GlobalContext* globalCtx) {
|
||||
Collider_CylinderUpdate(&this->actor, &this->colCylinder[0]);
|
||||
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->colCylinder[0].base);
|
||||
}
|
||||
|
||||
void EnSsh_SetLegsCylinderAC(EnSsh* this, GlobalContext* globalCtx) {
|
||||
s16 angleTowardsLink = ABS((s16)(this->actor.yawTowardsLink - this->actor.shape.rot.y));
|
||||
|
||||
if (angleTowardsLink < 90 * (0x10000 / 360)) {
|
||||
Collider_CylinderUpdate(&this->actor, &this->colCylinder[2]);
|
||||
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->colCylinder[2].base);
|
||||
} else {
|
||||
Collider_CylinderUpdate(&this->actor, &this->colCylinder[1]);
|
||||
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->colCylinder[1].base);
|
||||
}
|
||||
}
|
||||
|
||||
s32 EnSsh_SetCylinderOC(EnSsh* this, GlobalContext* globalCtx) {
|
||||
Vec3f cyloffsets[] = {
|
||||
{ 40.0f, 0.0f, 0.0f },
|
||||
{ 0.0f, 0.0f, 0.0f },
|
||||
{ -40.0f, 0.0f, 0.0f },
|
||||
};
|
||||
Vec3f cylPos;
|
||||
s32 i;
|
||||
|
||||
for (i = 0; i < 3; i++) {
|
||||
cylPos = this->actor.posRot.pos;
|
||||
cyloffsets[i].x *= this->colliderScale;
|
||||
cyloffsets[i].y *= this->colliderScale;
|
||||
cyloffsets[i].z *= this->colliderScale;
|
||||
Matrix_Push();
|
||||
Matrix_Translate(cylPos.x, cylPos.y, cylPos.z, MTXMODE_NEW);
|
||||
Matrix_RotateY((this->initialYaw / (f32)0x8000) * M_PI, MTXMODE_APPLY);
|
||||
Matrix_MultVec3f(&cyloffsets[i], &cylPos);
|
||||
Matrix_Pull();
|
||||
this->colCylinder[i + 3].dim.pos.x = cylPos.x;
|
||||
this->colCylinder[i + 3].dim.pos.y = cylPos.y;
|
||||
this->colCylinder[i + 3].dim.pos.z = cylPos.z;
|
||||
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->colCylinder[i + 3].base);
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
void EnSsh_SetColliders(EnSsh* this, GlobalContext* globalCtx) {
|
||||
if (this->actor.colChkInfo.health == 0) {
|
||||
CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->colSph.base);
|
||||
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->colSph.base);
|
||||
} else {
|
||||
if (this->hitTimer == 0) {
|
||||
EnSsh_SetCylinderOC(this, globalCtx);
|
||||
}
|
||||
if (DECR(this->invincibilityTimer) == 0) {
|
||||
EnSsh_SetBodyCylinderAC(this, globalCtx);
|
||||
EnSsh_SetLegsCylinderAC(this, globalCtx);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void EnSsh_Init(Actor* thisx, GlobalContext* globalCtx) {
|
||||
f32 frameCount;
|
||||
s32 pad;
|
||||
EnSsh* this = THIS;
|
||||
|
||||
frameCount = SkelAnime_GetFrameCount(&D_06000304.genericHeader);
|
||||
if (this->actor.params == ENSSH_FATHER) {
|
||||
if (gSaveContext.inventory.gsTokens >= 100) {
|
||||
Actor_Kill(&this->actor);
|
||||
return;
|
||||
}
|
||||
} else if (gSaveContext.inventory.gsTokens >= (this->actor.params * 10)) {
|
||||
Actor_Kill(&this->actor);
|
||||
return;
|
||||
}
|
||||
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f);
|
||||
SkelAnime_Init(globalCtx, &this->skelAnime, &D_060052E0, NULL, this->limbDrawTable, this->transDrawTable, 30);
|
||||
SkelAnime_ChangeAnim(&this->skelAnime, &D_06000304, 1.0f, 0.0f, frameCount, 1, 0.0f);
|
||||
this->blureIdx = EnSsh_CreateBlureEffect(globalCtx);
|
||||
EnSsh_InitColliders(this, globalCtx);
|
||||
this->stateFlags = 0;
|
||||
this->hitCount = 0;
|
||||
EnSsh_CheckCeilingPos(this, globalCtx);
|
||||
if (this->actor.params != ENSSH_FATHER) {
|
||||
EnSsh_SetColliderScale(this, 0.5f, 1.0f);
|
||||
} else {
|
||||
EnSsh_SetColliderScale(this, 0.75f, 1.0f);
|
||||
}
|
||||
this->actor.gravity = 0.0f;
|
||||
this->initialYaw = this->actor.posRot.rot.y;
|
||||
EnSsh_SetupAction(this, EnSsh_Start);
|
||||
}
|
||||
|
||||
void EnSsh_Destroy(Actor* thisx, GlobalContext* globalCtx) {
|
||||
s32 pad;
|
||||
EnSsh* this = THIS;
|
||||
s32 i;
|
||||
|
||||
Effect_Delete(globalCtx, this->blureIdx);
|
||||
for (i = 0; i < 6; i++) {
|
||||
Collider_DestroyCylinder(globalCtx, &this->colCylinder[i]);
|
||||
}
|
||||
Collider_DestroyJntSph(globalCtx, &this->colSph);
|
||||
}
|
||||
|
||||
void EnSsh_Wait(EnSsh* this, GlobalContext* globalCtx) {
|
||||
if (EnSsh_IsCloseToLink(this, globalCtx)) {
|
||||
EnSsh_SetDropAnimation(this);
|
||||
EnSsh_SetupAction(this, EnSsh_Drop);
|
||||
} else {
|
||||
EnSsh_Bob(this, globalCtx);
|
||||
}
|
||||
}
|
||||
|
||||
void EnSsh_Talk(EnSsh* this, GlobalContext* globalCtx) {
|
||||
EnSsh_Bob(this, globalCtx);
|
||||
if (func_8002F334(&this->actor, globalCtx)) {
|
||||
this->actionFunc = EnSsh_Idle;
|
||||
}
|
||||
}
|
||||
|
||||
void EnSsh_Idle(EnSsh* this, GlobalContext* globalCtx) {
|
||||
if (1) {}
|
||||
if (func_8002F194(&this->actor, globalCtx)) {
|
||||
this->actionFunc = EnSsh_Talk;
|
||||
if (this->actor.params == ENSSH_FATHER) {
|
||||
gSaveContext.eventChkInf[9] |= 0x40;
|
||||
}
|
||||
if ((this->actor.textId == 0x26) || (this->actor.textId == 0x27)) {
|
||||
gSaveContext.infTable[25] |= 0x40;
|
||||
}
|
||||
if ((this->actor.textId == 0x24) || (this->actor.textId == 0x25)) {
|
||||
gSaveContext.infTable[25] |= 0x80;
|
||||
}
|
||||
} else {
|
||||
if ((this->unkTimer != 0) && (DECR(this->unkTimer) == 0)) {
|
||||
EnSsh_SetAnimation(this, SSH_ANIM_WAIT);
|
||||
}
|
||||
if ((this->animTimer != 0) && (DECR(this->animTimer) == 0)) {
|
||||
EnSsh_SetAnimation(this, SSH_ANIM_WAIT);
|
||||
}
|
||||
if (!EnSsh_IsCloseToLink(this, globalCtx)) {
|
||||
EnSsh_SetReturnAnimation(this);
|
||||
EnSsh_SetupAction(this, EnSsh_Return);
|
||||
} else {
|
||||
if (DECR(this->sfxTimer) == 0) {
|
||||
Audio_PlayActorSound2(&this->actor, NA_SE_EN_STALTU_LAUGH);
|
||||
this->sfxTimer = 64;
|
||||
}
|
||||
EnSsh_Bob(this, globalCtx);
|
||||
if ((this->unkTimer == 0) && (this->animTimer == 0)) {
|
||||
this->actor.textId = Text_GetFaceReaction(globalCtx, 0xD);
|
||||
if (this->actor.textId == 0) {
|
||||
if (this->actor.params == ENSSH_FATHER) {
|
||||
if (gSaveContext.inventory.gsTokens >= 50) {
|
||||
this->actor.textId = 0x29;
|
||||
} else if (gSaveContext.inventory.gsTokens >= 10) {
|
||||
if (gSaveContext.infTable[25] & 0x80) {
|
||||
this->actor.textId = 0x24;
|
||||
} else {
|
||||
this->actor.textId = 0x25;
|
||||
}
|
||||
} else {
|
||||
if (gSaveContext.infTable[25] & 0x40) {
|
||||
this->actor.textId = 0x27;
|
||||
} else {
|
||||
this->actor.textId = 0x26;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
this->actor.textId = 0x22;
|
||||
}
|
||||
}
|
||||
func_8002F2CC(&this->actor, globalCtx, 100.0f);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void EnSsh_Land(EnSsh* this, GlobalContext* globalCtx) {
|
||||
if ((this->unkTimer != 0) && (DECR(this->unkTimer) == 0)) {
|
||||
EnSsh_SetAnimation(this, SSH_ANIM_WAIT);
|
||||
}
|
||||
if ((this->animTimer != 0) && (DECR(this->animTimer) == 0)) {
|
||||
EnSsh_SetAnimation(this, SSH_ANIM_WAIT);
|
||||
}
|
||||
if ((this->actor.groundY + this->groundYoffset) <= this->actor.posRot.pos.y) {
|
||||
EnSsh_SetupAction(this, EnSsh_Idle);
|
||||
} else {
|
||||
Math_SmoothScaleMaxMinF(&this->actor.velocity.y, 2.0f, 0.6f, 1000.0f, 0.0f);
|
||||
}
|
||||
}
|
||||
|
||||
void EnSsh_Drop(EnSsh* this, GlobalContext* globalCtx) {
|
||||
if ((this->unkTimer != 0) && (DECR(this->unkTimer) == 0)) {
|
||||
EnSsh_SetAnimation(this, SSH_ANIM_DROP);
|
||||
}
|
||||
if (!EnSsh_IsCloseToLink(this, globalCtx)) {
|
||||
EnSsh_SetReturnAnimation(this);
|
||||
EnSsh_SetupAction(this, EnSsh_Return);
|
||||
} else if (EnSsh_IsCloseToGround(this)) {
|
||||
EnSsh_SpawnShockwave(this, globalCtx);
|
||||
EnSsh_SetLandAnimation(this);
|
||||
EnSsh_SetupAction(this, EnSsh_Land);
|
||||
} else if (DECR(this->sfxTimer) == 0) {
|
||||
Audio_PlayActorSound2(&this->actor, NA_SE_EN_STALTU_DOWN);
|
||||
this->sfxTimer = 3;
|
||||
}
|
||||
}
|
||||
|
||||
void EnSsh_Return(EnSsh* this, GlobalContext* globalCtx) {
|
||||
f32 frameRatio = this->skelAnime.animCurrentFrame / (this->skelAnime.totalFrames - 1.0f);
|
||||
|
||||
if (frameRatio == 1.0f) {
|
||||
EnSsh_SetReturnAnimation(this);
|
||||
}
|
||||
if (EnSsh_IsCloseToLink(this, globalCtx)) {
|
||||
EnSsh_SetDropAnimation(this);
|
||||
EnSsh_SetupAction(this, EnSsh_Drop);
|
||||
} else if (EnSsh_IsCloseToHome(this)) {
|
||||
EnSsh_SetWaitAnimation(this);
|
||||
EnSsh_SetupAction(this, EnSsh_Wait);
|
||||
} else {
|
||||
this->actor.velocity.y = 4.0f * frameRatio;
|
||||
}
|
||||
}
|
||||
|
||||
void EnSsh_UpdateColliderScale(EnSsh* this) {
|
||||
if (this->stateFlags & SSH_STATE_SPIN) {
|
||||
if (this->spinTimer == 0) {
|
||||
this->stateFlags &= ~SSH_STATE_SPIN;
|
||||
if (this->actor.params != ENSSH_FATHER) {
|
||||
EnSsh_SetColliderScale(this, 0.5f, 1.0f);
|
||||
} else {
|
||||
EnSsh_SetColliderScale(this, 0.75f, 1.0f);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (this->spinTimer != 0) {
|
||||
this->stateFlags |= SSH_STATE_SPIN;
|
||||
if (this->actor.params != ENSSH_FATHER) {
|
||||
EnSsh_SetColliderScale(this, 0.5f, 2.0f);
|
||||
} else {
|
||||
EnSsh_SetColliderScale(this, 0.75f, 2.0f);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void EnSsh_Start(EnSsh* this, GlobalContext* globalCtx) {
|
||||
if (!EnSsh_IsCloseToGround(this)) {
|
||||
EnSsh_SetupAction(this, EnSsh_Wait);
|
||||
EnSsh_Wait(this, globalCtx);
|
||||
} else {
|
||||
EnSsh_SetLandAnimation(this);
|
||||
this->stateFlags |= 4;
|
||||
EnSsh_SetupAction(this, EnSsh_Land);
|
||||
EnSsh_Land(this, globalCtx);
|
||||
}
|
||||
}
|
||||
|
||||
void EnSsh_Update(Actor* thisx, GlobalContext* globalCtx) {
|
||||
s32 pad;
|
||||
EnSsh* this = THIS;
|
||||
|
||||
EnSsh_UpdateColliderScale(this);
|
||||
if (EnSsh_CollisionCheck(this, globalCtx)) {
|
||||
return; // EnSsh_CollisionCheck always returns false, so this never happens
|
||||
}
|
||||
if (this->stunTimer != 0) {
|
||||
EnSsh_Damaged(this);
|
||||
} else {
|
||||
SkelAnime_FrameUpdateMatrix(&this->skelAnime);
|
||||
func_8002D7EC(&this->actor);
|
||||
func_8002E4B4(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4);
|
||||
this->actionFunc(this, globalCtx);
|
||||
}
|
||||
EnSsh_UpdateYaw(this, globalCtx);
|
||||
if (DECR(this->blinkTimer) == 0) {
|
||||
this->blinkTimer = Math_Rand_S16Offset(60, 60);
|
||||
}
|
||||
this->blinkState = this->blinkTimer;
|
||||
if (this->blinkState >= 3) {
|
||||
this->blinkState = 0;
|
||||
}
|
||||
EnSsh_SetColliders(this, globalCtx);
|
||||
Actor_SetHeight(&this->actor, 0.0f);
|
||||
}
|
||||
|
||||
s32 EnSsh_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
|
||||
EnSsh* this = THIS;
|
||||
|
||||
switch (limbIndex) {
|
||||
case 1:
|
||||
if ((this->spinTimer != 0) && (this->swayTimer == 0)) {
|
||||
if (this->spinTimer >= 2) {
|
||||
EnSsh_AddBlureVertex(this);
|
||||
} else {
|
||||
EnSsh_AddBlureSpace(this);
|
||||
}
|
||||
}
|
||||
break;
|
||||
case 4:
|
||||
if (this->actor.params == ENSSH_FATHER) {
|
||||
*dList = D_060046C0;
|
||||
}
|
||||
break;
|
||||
case 5:
|
||||
if (this->actor.params == ENSSH_FATHER) {
|
||||
*dList = D_06004080;
|
||||
}
|
||||
break;
|
||||
case 8:
|
||||
if (this->actor.params == ENSSH_FATHER) {
|
||||
*dList = D_06004DE8;
|
||||
}
|
||||
break;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
void EnSsh_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
|
||||
EnSsh* this = THIS;
|
||||
|
||||
func_800628A4(limbIndex, &this->colSph);
|
||||
}
|
||||
|
||||
void EnSsh_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
||||
static u32* blinkTex[] = { 0x060007E0, 0x06000C60, 0x06001060 };
|
||||
s32 pad;
|
||||
EnSsh* this = THIS;
|
||||
|
||||
EnSsh_CheckBodyStickHit(this, globalCtx);
|
||||
EnSsh_Sway(this);
|
||||
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ssh.c", 2333);
|
||||
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(blinkTex[this->blinkState]));
|
||||
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ssh.c", 2336);
|
||||
SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, EnSsh_OverrideLimbDraw,
|
||||
EnSsh_PostLimbDraw, &this->actor);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,11 +6,41 @@
|
|||
|
||||
struct EnSsh;
|
||||
|
||||
typedef void (*EnSshActionFunc)(struct EnSsh*, GlobalContext*);
|
||||
|
||||
typedef struct EnSsh {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ char unk_14C[0x488];
|
||||
/* 0x014C */ SkelAnime skelAnime;
|
||||
/* 0x0190 */ Vec3s limbDrawTable[30];
|
||||
/* 0x0244 */ Vec3s transDrawTable[30];
|
||||
/* 0x02F8 */ EnSshActionFunc actionFunc;
|
||||
/* 0x02FC */ ColliderCylinder colCylinder[6];
|
||||
/* 0x04C4 */ ColliderJntSph colSph;
|
||||
/* 0x04E4 */ ColliderJntSphItem colSphElements[1];
|
||||
/* 0x0524 */ s16 initialYaw;
|
||||
/* 0x0526 */ s16 maxTurnRate;
|
||||
/* 0x0528 */ s16 unkTimer;
|
||||
/* 0x052A */ s16 spinTimer;
|
||||
/* 0x052C */ s16 hitTimer;
|
||||
/* 0x052E */ s16 invincibilityTimer;
|
||||
/* 0x0530 */ s16 sfxTimer;
|
||||
/* 0x0532 */ s16 stunTimer;
|
||||
/* 0x0534 */ s16 animTimer;
|
||||
/* 0x0536 */ s16 swayTimer;
|
||||
/* 0x0538 */ s32 blureIdx;
|
||||
/* 0x053C */ f32 colliderScale;
|
||||
/* 0x0540 */ f32 groundYoffset;
|
||||
/* 0x0544 */ Vec3f ceilingPos;
|
||||
/* 0x0558 */ char unk_558[0x78];
|
||||
/* 0x05C8 */ s16 swayAngle;
|
||||
/* 0x05CA */ u16 stateFlags;
|
||||
/* 0x05CC */ u8 hitCount;
|
||||
/* 0x05CE */ s16 blinkState;
|
||||
/* 0x05D0 */ s16 blinkTimer;
|
||||
} EnSsh; // size = 0x05D4
|
||||
|
||||
extern const ActorInit En_Ssh_InitVars;
|
||||
|
||||
#define ENSSH_FATHER 0
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ static ColliderCylinderInit sCylinderInit = {
|
|||
{ 32, 50, -24, { 0, 0, 0 } },
|
||||
};
|
||||
|
||||
static CollisionCheckInfoInit2 sColChkInit = { 0x02, 0x0000, 0x0000, 0x0000, 0xFF };
|
||||
static CollisionCheckInfoInit2 sColChkInit = { 2, 0, 0, 0, 0xFF };
|
||||
|
||||
static ColliderCylinderInit sCylinderInit2 = {
|
||||
{ COLTYPE_UNK6, 0x00, 0x00, 0x39, 0x10, COLSHAPE_CYLINDER },
|
||||
|
|
@ -247,7 +247,7 @@ void EnSt_InitColliders(EnSt* this, GlobalContext* globalCtx) {
|
|||
Collider_SetCylinder(globalCtx, &this->colCylinder[i], &this->actor, cylinders[i]);
|
||||
}
|
||||
|
||||
this->colCylinder[0].body.bumper.flags = 0x3F8F9;
|
||||
this->colCylinder[0].body.bumper.flags = 0x0003F8F9;
|
||||
this->colCylinder[1].body.bumper.flags = 0xFFC00706;
|
||||
this->colCylinder[2].base.type = 9;
|
||||
this->colCylinder[2].body.bumperFlags = 0xD;
|
||||
|
|
@ -453,7 +453,7 @@ s32 EnSt_CheckColliders(EnSt* this, GlobalContext* globalCtx) {
|
|||
}
|
||||
|
||||
if (EnSt_CheckHitBackside(&this->actor, globalCtx)) {
|
||||
// player has hit the backside ofthe skulltulla
|
||||
// player has hit the backside of the skulltulla
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -581,7 +581,7 @@ void EnSt_UpdateYaw(EnSt* this, GlobalContext* globalCtx) {
|
|||
rot = this->actor.shape.rot;
|
||||
yawTarget = (this->actionFunc == EnSt_WaitOnGround ? this->actor.yawTowardsLink : this->initalYaw);
|
||||
yawDiff = rot.y - (yawTarget ^ yawDir);
|
||||
if (ABS(yawDiff) < 0x4001) {
|
||||
if (ABS(yawDiff) <= 0x4000) {
|
||||
Math_SmoothScaleMaxMinS(&rot.y, yawTarget ^ yawDir, 4, 0x2000, 1);
|
||||
} else {
|
||||
rot.y += 0x2000;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue