falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

En_St (#443) 

* En_St

* Warning

* PR

* undef

* PR
This commit is contained in:
Maide 2022-01-04 04:09:32 +00:00 committed by GitHub
parent 6b50345831
commit 429a5ee9ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 873 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/functions.h
View File

@ -591,7 +591,8 @@ void EffectSsKiraKira_SpawnDispersed(GlobalContext* globalCtx, Vec3f* pos, Vec3f
void EffectSsBomb2_SpawnLayered(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale,
s16 scaleStep);
// void EffectSsBlast_Spawn(UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, Color_RGBA8* param_5, Color_RGBA8* param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE2 param_10);
// void EffectSsBlast_SpawnWhiteCustomScale(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7);
void EffectSsBlast_SpawnWhiteCustomScale(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale,
s16 scaleStep, s16 life);
// void EffectSsBlast_SpawnShockwave(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE2 param_7);
void EffectSsBlast_SpawnWhiteShockwave(GlobalContext* globalCtx, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3);
// void EffectSsGSpk_SpawnAccel(UNK_TYPE4 uParm1, UNK_TYPE4 uParm2, Vec3f* pzParm3, Vec3f* pzParm4, Vec3f* param_5, Color_RGBA8* param_6, Color_RGBA8* param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9);

3
include/variables.h
View File

@ -3895,7 +3895,8 @@ extern Gfx D_04023210[];
extern UNK_TYPE D_04023288;
extern Gfx D_04023348[];
extern Gfx D_04023428[];
extern UNK_TYPE D_04025850;
extern Gfx D_04025850[];
extern Gfx D_04025970[];
extern UNK_TYPE D_04025DD0;
extern UNK_TYPE D_040281DC;
extern UNK_TYPE D_04028FEC;

3
spec
View File

@ -961,8 +961,7 @@ beginseg
name "ovl_En_St"
compress
include "build/src/overlays/actors/ovl_En_St/z_en_st.o"
include "build/data/ovl_En_St/ovl_En_St.data.o"
include "build/data/ovl_En_St/ovl_En_St.reloc.o"
include "build/src/overlays/actors/ovl_En_St/ovl_En_St_reloc.o"
endseg
beginseg

888
src/overlays/actors/ovl_En_St/z_en_st.c
View File

@ -5,6 +5,8 @@
*/
#include "z_en_st.h"
#include "objects/object_st/object_st.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x01004035
@ -19,8 +21,8 @@ void func_808A6C04(EnSt* this, GlobalContext* globalCtx);
void func_808A6D84(EnSt* this, GlobalContext* globalCtx);
void func_808A6E24(EnSt* this, GlobalContext* globalCtx);
void func_808A701C(EnSt* this, GlobalContext* globalCtx);
void func_808A7478(Actor* thisx, GlobalContext* globalCtx);
#if 0
const ActorInit En_St_InitVars = {
ACTOR_EN_ST,
ACTORCAT_ENEMY,
@ -33,39 +35,89 @@ const ActorInit En_St_InitVars = {
(ActorFunc)NULL,
};
// static ColliderCylinderInit sCylinderInit = {
static ColliderCylinderInit D_808A75B0 = {
{ COLTYPE_HIT2, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_CYLINDER, },
{ ELEMTYPE_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0x800C3829, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_NONE, OCELEM_ON, },
static ColliderCylinderInit sCylinderInit1 = {
{
COLTYPE_HIT2,
AT_ON | AT_TYPE_ENEMY,
AC_NONE,
OC1_ON | OC1_TYPE_ALL,
OC2_TYPE_1,
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
{ 0xF7CFFFFF, 0x00, 0x00 },
{ 0x800C3829, 0x00, 0x00 },
TOUCH_ON | TOUCH_SFX_NORMAL,
BUMP_NONE,
OCELEM_ON,
},
{ 18, 48, -20, { 0, 0, 0 } },
};
// static ColliderCylinderInit sCylinderInit = {
static ColliderCylinderInit D_808A75DC = {
{ COLTYPE_HIT2, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, OC2_TYPE_1, COLSHAPE_CYLINDER, },
{ ELEMTYPE_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x77C3C7D6, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_NONE, },
static ColliderCylinderInit sCylinderInit2 = {
{
COLTYPE_HIT2,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,
OC2_TYPE_1,
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x77C3C7D6, 0x00, 0x00 },
TOUCH_NONE | TOUCH_SFX_NORMAL,
BUMP_ON,
OCELEM_NONE,
},
{ 18, 48, -20, { 0, 0, 0 } },
};
// static ColliderCylinderInit sCylinderInit = {
static ColliderCylinderInit D_808A7608 = {
{ COLTYPE_METAL, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_NONE, OC2_TYPE_1, COLSHAPE_CYLINDER, },
{ ELEMTYPE_UNK2, { 0x00000000, 0x00, 0x00 }, { 0x77C3C7D6, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_NONE, },
static ColliderCylinderInit sCylinderInit3 = {
{
COLTYPE_METAL,
AT_NONE,
AC_ON | AC_HARD | AC_TYPE_PLAYER,
OC1_NONE,
OC2_TYPE_1,
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK2,
{ 0x00000000, 0x00, 0x00 },
{ 0x77C3C7D6, 0x00, 0x00 },
TOUCH_NONE | TOUCH_SFX_NORMAL,
BUMP_ON,
OCELEM_NONE,
},
{ 18, 48, -20, { 0, 0, 0 } },
};
// static ColliderCylinderInit sCylinderInit = {
static ColliderCylinderInit D_808A7634 = {
{ COLTYPE_HIT2, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, OC2_TYPE_1, COLSHAPE_CYLINDER, },
{ ELEMTYPE_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x800C3829, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_NONE, },
static ColliderCylinderInit sCylinderInit4 = {
{
COLTYPE_HIT2,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,
OC2_TYPE_1,
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x800C3829, 0x00, 0x00 },
TOUCH_NONE | TOUCH_SFX_NORMAL,
BUMP_ON,
OCELEM_NONE,
},
{ 18, 48, -20, { 0, 0, 0 } },
};
// sColChkInfoInit
static CollisionCheckInfoInit2 D_808A7660 = { 2, 0, 0, 0, MASS_IMMOVABLE };
static CollisionCheckInfoInit2 sColChkInfoInit = { 2, 0, 0, 0, MASS_IMMOVABLE };
// static DamageTable sDamageTable = {
static DamageTable D_808A766C = {
static DamageTable sDamageTable = {
/* Deku Nut */ DMG_ENTRY(0, 0x1),
/* Deku Stick */ DMG_ENTRY(1, 0x0),
/* Horse trample */ DMG_ENTRY(0, 0x0),
@ -100,73 +152,791 @@ static DamageTable D_808A766C = {
/* Powder Keg */ DMG_ENTRY(1, 0x0),
};
#endif
static ActorAnimationEntryS sAnimations[] = {
{ &object_st_Anim_000304, 1.0f, 0, -1, 0, 0 }, { &object_st_Anim_005B98, 1.0f, 0, -1, 2, -4 },
{ &object_st_Anim_000304, 4.0f, 0, -1, 2, -4 }, { &object_st_Anim_000304, 1.0f, 0, -1, 0, -4 },
{ &object_st_Anim_0055A8, 1.0f, 0, -1, 2, -4 }, { &object_st_Anim_000304, 8.0f, 0, -1, 0, -4 },
{ &object_st_Anim_000304, 6.0f, 0, -1, 2, -4 }, { &object_st_Anim_005B98, 2.0f, 0, -1, 0, -4 },
};
extern ColliderCylinderInit D_808A75B0;
extern ColliderCylinderInit D_808A75DC;
extern ColliderCylinderInit D_808A7608;
extern ColliderCylinderInit D_808A7634;
extern CollisionCheckInfoInit2 D_808A7660;
extern DamageTable D_808A766C;
void func_808A5050(EnSt* this, GlobalContext* globalCtx) {
static Color_RGBA8 D_808A770C = { 170, 130, 90, 255 };
static Color_RGBA8 D_808A7710 = { 100, 60, 20, 0 };
s32 i;
Vec3f spB8;
Vec3f spAC;
Vec3f spA0;
Vec3f sp94;
s32 rand;
s16 temp_s0 = (Rand_ZeroOne() - 0.5f) * 0x10000;
extern UNK_TYPE D_06005298;
spA0.y = this->actor.floorHeight;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/func_808A5050.s")
for (i = 0; i < 16; i++, temp_s0 += 0xFFF) {
rand = (Rand_ZeroOne() * 4.0f) + 8.0f;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/func_808A52A8.s")
sp94.x = 0.0f;
sp94.y = (Rand_ZeroOne() * 0.2f) + 0.1f;
sp94.z = Rand_ZeroOne() + 1.0f;
Lib_Vec3f_TranslateAndRotateY(&gZeroVec3f, temp_s0, &sp94, &spAC);
sp94.x = 0.0f;
sp94.y = 1.0f;
sp94.z = 5.0f;
Lib_Vec3f_TranslateAndRotateY(&gZeroVec3f, temp_s0, &sp94, &spB8);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/func_808A54B0.s")
spA0.x = this->actor.world.pos.x + (2.0f * spB8.x);
spA0.z = this->actor.world.pos.z + (2.0f * spB8.z);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/func_808A576C.s")
func_800B0EB0(globalCtx, &spA0, &spB8, &spAC, &D_808A770C, &D_808A7710, 100, 40, rand);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/func_808A5988.s")
spA0.x = this->actor.world.pos.x;
spA0.z = this->actor.world.pos.z;
spA0.y = this->actor.floorHeight;
EffectSsBlast_SpawnWhiteCustomScale(globalCtx, &spA0, &gZeroVec3f, &gZeroVec3f, 100, 220, 8);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/func_808A5AF8.s")
void func_808A52A8(EnSt* this, GlobalContext* globalCtx) {
static Color_RGBA8 D_808A7714 = { 170, 130, 90, 255 };
static Color_RGBA8 D_808A7718 = { 100, 60, 20, 0 };
s32 pad;
Vec3f spB8;
Vec3f spAC;
Vec3f spA0;
Vec3f sp94;
s32 i;
s16 temp_s0 = (Rand_ZeroOne() - 0.5f) * 0x10000;
s32 rand;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/func_808A5BEC.s")
spA0.y = this->actor.floorHeight;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/func_808A5CCC.s")
for (i = 0; i < 8; i++, temp_s0 += 0x1FFE) {
rand = (Rand_ZeroOne() * 4.0f) + 8.0f;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/func_808A5D7C.s")
sp94.x = 0.0f;
sp94.y = (Rand_ZeroOne() * 0.2f) + 0.1f;
sp94.z = Rand_ZeroOne() + 1.0f;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/func_808A5DCC.s")
Lib_Vec3f_TranslateAndRotateY(&gZeroVec3f, temp_s0, &sp94, &spAC);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/func_808A5F28.s")
sp94.x = 0.0f;
sp94.y = 1.0f;
sp94.z = 4.0f;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/func_808A6064.s")
Lib_Vec3f_TranslateAndRotateY(&gZeroVec3f, temp_s0, &sp94, &spB8);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/func_808A60E0.s")
spA0.x = this->actor.world.pos.x + (2.0f * spB8.x);
spA0.z = this->actor.world.pos.z + (2.0f * spB8.z);
func_800B0EB0(globalCtx, &spA0, &spB8, &spAC, &D_808A7714, &D_808A7718, 100, 40, rand);
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/func_808A61F4.s")
void func_808A54B0(EnSt* this, GlobalContext* globalCtx) {
s32 pad;
f32 temp_f0;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/func_808A6220.s")
if ((this->unk_18C & 1) && (this->actor.colChkInfo.health != 0)) {
OPEN_DISPS(globalCtx->state.gfxCtx);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/func_808A63E8.s")
gSegments[6] = PHYSICAL_TO_VIRTUAL2(globalCtx->objectCtx.status[this->unk_2C0].segment);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/func_808A6468.s")
gSPSegment(POLY_XLU_DISP++, 0x06, globalCtx->objectCtx.status[this->unk_2C0].segment);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/func_808A650C.s")
func_8012C2DC(globalCtx->state.gfxCtx);
Matrix_InsertTranslation(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z,
MTXMODE_NEW);
Matrix_RotateY(this->actor.shape.rot.y, MTXMODE_APPLY);
Matrix_Scale(0.06f, 0.12f, 0.06f, MTXMODE_APPLY);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/func_808A6580.s")
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_XLU_DISP++, 0x08,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 195, 0, 0x40, 0x20, 1, 215, 0, 8, 8));
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/func_808A6A3C.s")
temp_f0 = (f32)this->unk_310 / 8;
if (temp_f0 > 1.0f) {
temp_f0 = 1.0f;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/func_808A6A78.s")
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 170, 255, 255, (u8)(255 * temp_f0));
gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_025850);
gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_025970);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/func_808A6C04.s")
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/func_808A6D84.s")
s32 func_808A576C(EnSt* this) {
s32 i;
s16 phi_s2 = (s16)((s16)(Rand_ZeroOne() * 1000.0f) % 12) * 0x1555;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/func_808A6E24.s")
for (i = 0; i < ARRAY_COUNT(this->unk_31C); i++, phi_s2 += 0x1555) {
if (this->unk_18E != 10) {
this->unk_31C[i] = (Rand_ZeroOne() * 16.0f) + 8.0f;
} else {
this->unk_31C[i] = 80;
}
this->unk_334[i] = this->unk_31C[i];
this->unk_2DC[i] = 0.90000004f;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/func_808A701C.s")
if ((this->unk_18E == 0) || (this->unk_18E == 1)) {
this->unk_358[i].y = ((Rand_ZeroOne() - 0.5f) * 40.0f) - 10.0f;
} else {
this->unk_358[i].y = ((Rand_ZeroOne() - 0.5f) * 30.0f) + 10.0f;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/EnSt_Init.s")
this->unk_358[i].x = Math_SinS(phi_s2) * 18.0f;
this->unk_358[i].z = Math_CosS(phi_s2) * 18.0f;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/EnSt_Destroy.s")
this->unk_31A = 1;
return false;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/EnSt_Update.s")
s32 func_808A5988(EnSt* this, GlobalContext* globalCtx, s32 arg2) {
s32 ret = false;
u8 sp53;
Vec3f sp44;
f32 sp40;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/func_808A73E8.s")
if (arg2 < this->unk_31A) {
if (this->unk_31C[arg2] != 0) {
sp40 = (f32)this->unk_31C[arg2] / this->unk_334[arg2];
sp53 = this->unk_18E;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_St/func_808A7478.s")
Math_ApproachF(&this->unk_2DC[arg2], 0.6f, 0.3f, 0.5f);
Math_Vec3f_Copy(&sp44, &this->actor.world.pos);
sp44.x += this->unk_358[arg2].x;
sp44.y += this->unk_358[arg2].y;
sp44.z += this->unk_358[arg2].z;
if (sp53 == 10) {
if ((this->unk_334[arg2] - this->unk_31C[arg2]) < 20) {
sp53 = 11;
}
sp40 = 1.0f;
}
func_800BE680(globalCtx, &this->actor, &sp44, 1, 0.6f, this->unk_2DC[arg2], sp40, sp53);
ret = true;
}
}
return ret;
}
void func_808A5AF8(EnSt* this, GlobalContext* globalCtx) {
Vec3f sp54;
s32 i;
for (i = 0; i < ARRAY_COUNT(this->unk_358); i++) {
Math_Vec3f_Copy(&sp54, &this->actor.world.pos);
sp54.x += this->unk_358[i].x;
sp54.y += this->unk_358[i].y;
sp54.z += this->unk_358[i].z;
Math_Vec3f_Copy(&this->unk_358[i], &sp54);
}
func_800BF7CC(globalCtx, &this->actor, this->unk_358, 12, 3, 0.1f, 0.3f);
}
s16 func_808A5BEC(EnSt* this) {
s16 ret;
if (!(this->unk_18C & 4) || (this->actor.xzDistToPlayer > 180.0f)) {
ret = this->actor.home.rot.y;
} else {
ret = this->actor.yawTowardsPlayer;
if (DECR(this->unk_30E) == 0) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_STALTU_ROLL);
this->unk_18C ^= 2;
this->unk_310 = 8;
if (this->unk_18C & 1) {
this->unk_310 *= 2;
}
this->unk_30E = 30;
}
if (this->unk_18C & 2) {
ret = BINANG_ROT180(ret);
}
}
return ret;
}
void func_808A5CCC(EnSt* this) {
if (this->unk_310 != 0) {
this->unk_310--;
}
if (this->unk_310 < 8) {
Math_ApproachS(&this->actor.world.rot.y, func_808A5BEC(this), 3, 0x1FFE);
} else {
this->actor.world.rot.y += 0x2AA8;
}
this->actor.shape.rot.y = this->actor.world.rot.y;
if (DECR(this->unk_310) == 0) {
this->unk_18C &= ~1;
}
}
void func_808A5D7C(EnSt* this) {
if (this->unk_2C8 > 0.0f) {
this->actor.world.pos.y = this->actor.home.pos.y - 10.0f;
} else {
this->actor.world.pos.y = this->actor.floorHeight + 20.0f;
}
}
void func_808A5DCC(EnSt* this, Color_RGB8* colour) {
if (this->unk_2D8 == 0.0f) {
Math_SmoothStepToF(&this->unk_34C, 0.0f, 0.3f, 1000.0f, 0.0f);
} else {
this->unk_34C += this->unk_2D8;
if (this->unk_34C >= 255.0f) {
this->unk_34C = 255.0f;
this->unk_2D8 *= -1.0f;
}
if (this->unk_34C <= 0.0f) {
this->unk_34C = 0.0f;
this->unk_2D8 *= -1.0f;
}
}
colour->r = this->unk_34C;
colour->g = 0;
colour->b = 0;
}
s32 func_808A5F28(EnSt* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
s32 ret = false;
if (Player_GetMask(globalCtx) == PLAYER_MASK_STONE) {
if (this->unk_2C8 <= 0.0f) {
return false;
}
return true;
}
if ((((this->unk_2C8 > 0.0f) && (this->actor.world.pos.y < player->actor.world.pos.y)) ||
((this->unk_2C8 > 0.0f) && (this->actor.xzDistToPlayer > 180.0f)) ||
((this->unk_2C8 < 0.0f) && (player->actor.world.pos.y <= this->actor.world.pos.y) &&
(this->actor.floorHeight <= player->actor.world.pos.y) && (this->actor.xzDistToPlayer < 120.0f))) &&
!(this->unk_18C & 8)) {
ret = true;
}
return ret;
}
s32 func_808A6064(EnSt* this) {
s32 ret = false;
if (this->unk_2C8 > 0.0f) {
if ((this->actor.home.pos.y - 10.0f) < this->actor.world.pos.y) {
ret = true;
}
} else if (this->actor.world.pos.y < (this->actor.floorHeight + 20.0f)) {
ret = true;
}
return ret;
}
void func_808A60E0(EnSt* this) {
s32 idx = (this->unk_2C8 > 0.0f) ? 2 : 6;
f32 sp20 = (this->unk_2C8 > 0.0f) ? 4.0f : 9.0f;
f32 sp1C;
u16 sfxId = (this->unk_2C8 < 0.0f) ? NA_SE_EN_STALTU_DOWN : NA_SE_EN_STALTU_UP;
sp1C = this->skelAnime.curFrame / (this->skelAnime.animLength - 1.0f);
if (sp1C == 1.0f) {
func_8013BC6C(&this->skelAnime, sAnimations, idx);
Audio_PlayActorSound2(&this->actor, sfxId);
}
this->unk_2D4 = (1.0f - sp1C) * sp20 * this->unk_2C8;
if (this->unk_2C8 < 0.0f) {
this->unk_2D4 = this->unk_2C8 * sp20;
}
}
s32 func_808A61F4(EnSt* this) {
if (this->actor.colChkInfo.damage < this->actor.colChkInfo.health) {
this->actor.colChkInfo.health -= this->actor.colChkInfo.damage;
} else {
this->actor.colChkInfo.health = 0;
}
return this->actor.colChkInfo.health;
}
void func_808A6220(EnSt* this, GlobalContext* globalCtx) {
s32 pad;
if ((DECR(this->unk_314) == 0) && (this->actor.colChkInfo.health != 0)) {
Collider_UpdateCylinder(&this->actor, &this->collider2);
Collider_UpdateCylinder(&this->actor, &this->collider3);
Collider_UpdateCylinder(&this->actor, &this->collider4);
if ((s16)ABS_ALT(BINANG_SUB(this->actor.yawTowardsPlayer, this->actor.shape.rot.y)) < 0x4E00) {
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider3.base);
} else {
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider2.base);
}
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider4.base);
}
if (this->actor.colChkInfo.health != 0) {
Collider_UpdateCylinder(&this->actor, &this->collider1);
if (((this->unk_2C8 < 0.0f) && (this->unk_18C & 0x10)) || (this->unk_18C & 1)) {
this->collider1.dim.yShift = -40;
this->collider1.dim.radius = 56;
this->collider1.dim.height = 80;
} else {
this->collider1.dim.yShift = -20;
this->collider1.dim.radius = 18;
this->collider1.dim.height = 48;
}
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider1.base);
CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->collider1.base);
}
}
void func_808A63E8(EnSt* this) {
func_8013BC6C(&this->skelAnime, sAnimations, 3);
this->unk_2C8 = 1.0f;
func_808A5D7C(this);
this->unk_30C = 0;
this->unk_18C &= ~0x10;
this->unk_2C8 = -1.0f;
this->unk_2D4 = 0.0f;
this->unk_2CC = 0.0f;
this->unk_2C4 = 1.0f;
}
void func_808A6468(EnSt* this, GlobalContext* globalCtx) {
func_808A5050(this, globalCtx);
func_8013BC6C(&this->skelAnime, sAnimations, 4);
this->unk_18C |= (0x8 | 0x4);
this->unk_18C &= ~(0x10 | 0x2);
this->unk_2C8 = -1.0f;
func_808A5D7C(this);
this->unk_30E = 30;
this->unk_30C = 0;
this->unk_2C8 = 1.0f;
this->unk_2D8 = 30.0f;
this->unk_2D4 = 0.0f;
this->unk_2CC = 0.0f;
this->unk_2C4 = 6.0f;
}
void func_808A650C(EnSt* this) {
s32 idx = (this->unk_2C8 > 0.0f) ? 2 : 6;
func_8013BC6C(&this->skelAnime, sAnimations, idx);
this->unk_2CC = 0.0f;
this->unk_2D4 = 0.0f;
this->unk_2D8 = 0.0f;
this->unk_18C &= ~4;
this->unk_18C |= 0x10;
}
s32 func_808A6580(EnSt* this, GlobalContext* globalCtx) {
Player* sp3C = GET_PLAYER(globalCtx);
s32 ret = false;
s32 i;
if (this->unk_316 != 0) {
this->unk_316--;
}
if (this->collider3.base.acFlags & AC_HIT) {
if (this->unk_18E == 10) {
// clang-format off
for (i = 0; i < ARRAY_COUNT(this->unk_31C); i++) { this->unk_31C[i] = 0; }
// clang-format on
this->unk_318 = 0;
}
if (this->actor.colChkInfo.damageEffect == 4) {
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_CLEAR_TAG, this->actor.world.pos.x,
this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, CLEAR_TAG_LARGE_LIGHT_RAYS);
}
this->collider3.base.acFlags &= ~AC_HIT;
}
if ((this->collider2.base.acFlags & AC_HIT) || (this->collider4.base.acFlags & AC_HIT)) {
this->collider2.base.acFlags &= ~AC_HIT;
this->collider4.base.acFlags &= ~AC_HIT;
if (this->actor.colChkInfo.damageEffect == 4) {
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_CLEAR_TAG, this->actor.world.pos.x,
this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, CLEAR_TAG_LARGE_LIGHT_RAYS);
}
if (this->unk_18E == 10) {
// clang-format off
for (i = 0; i < ARRAY_COUNT(this->unk_31C); i++) { this->unk_31C[i] = 0; }
// clang-format on
this->unk_318 = 0;
} else if (func_808A61F4(this)) {
switch (this->actor.colChkInfo.damageEffect) {
case 1:
Audio_PlayActorSound2(&this->actor, NA_SE_EN_COMMON_FREEZE);
this->unk_312 = 40;
func_800BCB70(&this->actor, 0, 200, 0, this->unk_312);
break;
case 5:
this->unk_18E = 30;
this->unk_312 = 40;
func_808A576C(this);
func_800BCB70(&this->actor, 0, 200, 0, this->unk_312);
break;
default:
Audio_PlayActorSound2(&this->actor, NA_SE_EN_STALTU_DAMAGE);
this->unk_314 = 20;
this->unk_312 = 0;
func_800BCB70(&this->actor, 0x4000, 200, 0, this->unk_314);
func_8013BC6C(&this->skelAnime, sAnimations, 1);
this->unk_18C |= 8;
this->actionFunc = func_808A6D84;
this->unk_2C8 = -1.0f;
break;
}
} else {
if (ENST_GET_3F(&this->actor) != ENST_3F_63) {
Actor_SetSwitchFlag(globalCtx, ENST_GET_3F(&this->actor));
}
Audio_PlaySoundAtPosition(globalCtx, &this->actor.world.pos, 40, NA_SE_EN_STALTU_DEAD);
Enemy_StartFinishingBlow(globalCtx, &this->actor);
this->actor.flags &= ~1;
switch (this->actor.colChkInfo.damageEffect) {
case 4:
this->unk_18E = 20;
this->unk_318 = 20;
func_808A576C(this);
break;
case 3:
this->unk_18E = 10;
this->unk_318 = 0;
func_808A576C(this);
break;
case 2:
this->unk_18E = 0;
this->unk_318 = 20;
func_808A576C(this);
break;
default:
this->unk_18E = 1;
this->unk_318 = 0;
break;
}
if (this->unk_18E != 10) {
func_8013BC6C(&this->skelAnime, sAnimations, 7);
this->unk_2CC = 0.0f;
this->unk_2D4 = 0.0f;
this->actor.gravity = -1.0f;
}
this->unk_314 = 20;
this->unk_312 = 0;
func_800BCB70(&this->actor, 0x4000, 200, 0, this->unk_314);
ret = true;
}
this->unk_310 = 0;
this->unk_18C &= ~1;
}
if ((this->collider1.base.ocFlags2 & OC2_HIT_PLAYER) || (this->collider1.base.atFlags & AT_HIT)) {
if ((this->unk_316 == 0) && (this->unk_314 == 0) && (this->unk_312 == 0) &&
!(this->collider1.base.atFlags & AT_BOUNCED) && (this->actor.colChkInfo.health != 0)) {
globalCtx->damagePlayer(globalCtx, -8);
Audio_PlayActorSound2(&sp3C->actor, NA_SE_PL_BODY_HIT);
func_800B8D98(globalCtx, &this->actor, 4.0f, this->actor.yawTowardsPlayer, 6.0f);
this->unk_316 = 10;
this->unk_18C |= 1;
this->unk_30E = 0;
}
this->collider1.base.ocFlags1 &= ~OC1_HIT;
this->collider1.base.atFlags &= ~AT_HIT;
}
return ret;
}
s32 func_808A6A3C(EnSt* this) {
s32 ret = false;
if ((ENST_GET_1C0(&this->actor) == ENST_1C0_1) && (this->actor.colChkInfo.health != 0)) {
ret = true;
}
return ret;
}
void func_808A6A78(EnSt* this, GlobalContext* globalCtx) {
s32 pad[2];
if (Object_IsLoaded(&globalCtx->objectCtx, this->unk_2C0)) {
ActorShape_Init(&this->actor.shape, 0.0f, func_800B3FC0, 8.0f);
SkelAnime_Init(globalCtx, &this->skelAnime, &object_st_Skel_005298, NULL, this->jointTable, this->morphTable,
30);
func_8013BC6C(&this->skelAnime, sAnimations, 0);
Collider_InitAndSetCylinder(globalCtx, &this->collider1, &this->actor, &sCylinderInit1);
Collider_InitAndSetCylinder(globalCtx, &this->collider2, &this->actor, &sCylinderInit2);
Collider_InitAndSetCylinder(globalCtx, &this->collider3, &this->actor, &sCylinderInit3);
Collider_InitAndSetCylinder(globalCtx, &this->collider4, &this->actor, &sCylinderInit4);
CollisionCheck_SetInfo2(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);
if (ENST_GET_1C0(&this->actor) == ENST_1C0_1) {
this->actor.flags |= 0x80;
}
Actor_SetScale(&this->actor, 0.04f);
this->actor.draw = func_808A7478;
this->actor.hintId = 4;
this->actor.gravity = 0.0f;
func_808A63E8(this);
this->unk_18C = 0;
this->unk_18C &= ~0x10;
this->actionFunc = func_808A6C04;
}
}
void func_808A6C04(EnSt* this, GlobalContext* globalCtx) {
this->unk_2CC = Math_SinS(this->unk_30C) * this->unk_2C4;
this->unk_30C += 0xE00;
Math_ApproachF(&this->unk_2C4, 1.0f, 0.1f, 0.3f);
this->actor.velocity.y = this->unk_2D4 + this->unk_2CC;
Actor_SetVelocityAndMoveYRotationAndGravity(&this->actor);
if ((this->unk_18C & 8) && Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
func_8013BC6C(&this->skelAnime, sAnimations, 3);
this->unk_18C &= ~8;
} else if ((this->unk_310 == 0) && func_808A5F28(this, globalCtx) && !func_808A6064(this)) {
func_808A650C(this);
this->actionFunc = func_808A6D84;
} else {
if ((this->unk_316 == 0) && (this->unk_314 == 0) && (this->unk_312 == 0) && (this->unk_2C8 > 0.0f) &&
(this->actor.xzDistToPlayer < 62.0f)) {
this->unk_30E = 0;
this->unk_18C |= 1;
}
func_808A5CCC(this);
}
}
void func_808A6D84(EnSt* this, GlobalContext* globalCtx) {
func_808A60E0(this);
this->actor.velocity.y = this->unk_2D4 + this->unk_2CC;
Actor_SetVelocityAndMoveYRotationAndGravity(&this->actor);
if (func_808A6064(this)) {
if (this->unk_2C8 < 0.0f) {
func_808A6468(this, globalCtx);
} else {
func_808A63E8(this);
}
this->actionFunc = func_808A6C04;
}
func_808A5CCC(this);
}
void func_808A6E24(EnSt* this, GlobalContext* globalCtx) {
s32 i;
s32 count = 0;
if (this->unk_18E == 10) {
for (i = 0; i < ARRAY_COUNT(this->unk_31C); i++) {
if (DECR(this->unk_31C[i]) == 0) {
count++;
}
}
if (count == ARRAY_COUNT(this->unk_31C)) {
func_8013BC6C(&this->skelAnime, sAnimations, 7);
this->unk_18E = 1;
this->unk_2CC = 0.0f;
this->unk_2D4 = 0.0f;
this->actor.gravity = -1.0f;
func_808A5AF8(this, globalCtx);
}
} else if (this->unk_18C & 0x80) {
this->actionFunc = func_808A701C;
this->actor.gravity = 0.0f;
this->unk_2CC = 0.0f;
this->unk_2D4 = 0.0f;
} else {
if (this->actor.bgCheckFlags & 1) {
this->actor.shape.yOffset = 400.0f;
this->actor.world.rot.x = 0x4000;
this->actor.shape.rot.x = this->actor.world.rot.x;
this->unk_2D0 = this->actor.velocity.y = fabsf(this->actor.velocity.y) * 0.6f;
this->actor.speedXZ = 0.0f;
if ((s32)this->unk_2D0 != 0) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_EYEGOLE_ATTACK);
} else {
this->actor.velocity.y = 0.0f;
this->actionFunc = func_808A701C;
}
if ((s32)this->actor.velocity.y >= 2) {
func_808A52A8(this, globalCtx);
}
} else {
Math_ApproachF(&this->actor.shape.yOffset, 400.0f, 0.3f, 1000.0f);
this->actor.world.rot.x += 0x1000;
if (this->actor.world.rot.x >= 0x4000) {
this->actor.world.rot.x = 0x4000;
}
this->actor.shape.rot.x = this->actor.world.rot.x;
}
Actor_SetVelocityAndMoveYRotationAndGravity(&this->actor);
}
}
void func_808A701C(EnSt* this, GlobalContext* globalCtx) {
s32 i;
s32 count = 0;
if (this->unk_18C & 0x40) {
if (DECR(this->unk_318) == 0) {
this->unk_18C |= 0x20;
}
for (i = 0; i < ARRAY_COUNT(this->unk_31C); i++) {
if (DECR(this->unk_31C[i]) == 0) {
count++;
}
}
if (count == ARRAY_COUNT(this->unk_31C)) {
Item_DropCollectibleRandom(globalCtx, NULL, &this->actor.world.pos, 0);
Actor_MarkForDeath(&this->actor);
}
} else if (DECR(this->unk_318) == 0) {
this->unk_18C |= 0x40;
if (this->unk_18E == 1) {
func_808A576C(this);
this->unk_318 = 10;
}
}
}
void EnSt_Init(Actor* thisx, GlobalContext* globalCtx) {
EnSt* this = THIS;
this->unk_2C0 = Object_GetIndex(&globalCtx->objectCtx, GAMEPLAY_KEEP);
if (((ENST_GET_3F(&this->actor) != ENST_3F_63) && Flags_GetSwitch(globalCtx, ENST_GET_3F(&this->actor))) ||
(this->unk_2C0 < 0)) {
Actor_MarkForDeath(&this->actor);
} else {
this->actionFunc = func_808A6A78;
}
}
void EnSt_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnSt* this = THIS;
Collider_DestroyCylinder(globalCtx, &this->collider1);
Collider_DestroyCylinder(globalCtx, &this->collider2);
Collider_DestroyCylinder(globalCtx, &this->collider3);
Collider_DestroyCylinder(globalCtx, &this->collider4);
}
void EnSt_Update(Actor* thisx, GlobalContext* globalCtx) {
EnSt* this = THIS;
if (this->actor.flags & 0x8000) {
SkelAnime_Update(&this->skelAnime);
this->unk_18C |= 0x80;
return;
}
if (!(this->actor.flags & 0x80) && func_808A6A3C(this)) {
this->actor.flags |= 0x80;
}
if (func_808A6580(this, globalCtx)) {
this->actionFunc = func_808A6E24;
} else if (DECR(this->unk_312) == 0) {
this->actionFunc(this, globalCtx);
if (this->unk_18E != 10) {
SkelAnime_Update(&this->skelAnime);
}
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 30.0f, 12.0f, 0.0f, 5);
} else if (this->unk_312 < 20) {
s16 idx = (this->unk_312 % 2) ? -1 : 1;
idx *= 0x800;
idx += this->actor.world.rot.y;
this->actor.shape.rot.y = idx;
if (this->unk_18E == 30) {
if (this->unk_312 == 1) {
s32 i;
// clang-format off
for (i = 0; i < ARRAY_COUNT(this->unk_31C); i++) { this->unk_31C[i] = 0; }
// clang-format on
}
}
}
Actor_SetHeight(&this->actor, 0.0f);
func_808A6220(this, globalCtx);
}
s32 EnSt_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx,
Gfx** gfx) {
EnSt* this = THIS;
Color_RGB8 sp20;
if (limbIndex == 4) {
func_808A5DCC(this, &sp20);
gDPPipeSync((*gfx)++);
gDPSetEnvColor((*gfx)++, sp20.r, sp20.g, sp20.b, 0);
}
return false;
}
void func_808A7478(Actor* thisx, GlobalContext* globalCtx) {
EnSt* this = THIS;
s32 i;
s32 count;
if (!(this->unk_18C & 0x20)) {
OPEN_DISPS(globalCtx->state.gfxCtx);
if (func_808A6A3C(this)) {
func_8012C2DC(globalCtx->state.gfxCtx);
POLY_XLU_DISP = SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable,
EnSt_OverrideLimbDraw, NULL, &this->actor, POLY_XLU_DISP);
} else {
func_8012C28C(globalCtx->state.gfxCtx);
POLY_OPA_DISP = SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable,
EnSt_OverrideLimbDraw, NULL, &this->actor, POLY_OPA_DISP);
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
for (i = 0, count = 0; i < ARRAY_COUNT(this->unk_31C); i++) {
count += func_808A5988(this, globalCtx, i);
}
if (count != 0) {
this->unk_31A += 2;
}
func_808A54B0(this, globalCtx);
}

42
src/overlays/actors/ovl_En_St/z_en_st.h
View File

@ -7,11 +7,45 @@ struct EnSt;
typedef void (*EnStActionFunc)(struct EnSt*, GlobalContext*);
#define ENST_GET_3F(thisx) (((thisx)->params & 0x3F) & 0xFF)
#define ENST_GET_1C0(thisx) ((((thisx)->params & 0x1C0) >> 6) & 0xFF)
#define ENST_3F_63 63
#define ENST_1C0_1 1
typedef struct EnSt {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x44];
/* 0x0188 */ EnStActionFunc actionFunc;
/* 0x018C */ char unk_18C[0x3C4];
/* 0x000 */ Actor actor;
/* 0x144 */ SkelAnime skelAnime;
/* 0x188 */ EnStActionFunc actionFunc;
/* 0x18C */ u16 unk_18C;
/* 0x18E */ u8 unk_18E;
/* 0x190 */ ColliderCylinder collider1;
/* 0x1DC */ ColliderCylinder collider2;
/* 0x228 */ ColliderCylinder collider3;
/* 0x274 */ ColliderCylinder collider4;
/* 0x2C0 */ s8 unk_2C0;
/* 0x2C4 */ f32 unk_2C4;
/* 0x2C8 */ f32 unk_2C8;
/* 0x2CC */ f32 unk_2CC;
/* 0x2D0 */ f32 unk_2D0;
/* 0x2D4 */ f32 unk_2D4;
/* 0x2D8 */ f32 unk_2D8;
/* 0x2DC */ f32 unk_2DC[12];
/* 0x30C */ s16 unk_30C;
/* 0x30E */ s16 unk_30E;
/* 0x310 */ s16 unk_310;
/* 0x312 */ s16 unk_312;
/* 0x314 */ s16 unk_314;
/* 0x316 */ s16 unk_316;
/* 0x318 */ s16 unk_318;
/* 0x31A */ s16 unk_31A;
/* 0x31C */ s16 unk_31C[12];
/* 0x334 */ s16 unk_334[12];
/* 0x34C */ f32 unk_34C;
/* 0x350 */ UNK_TYPE1 unk_350[0x8];
/* 0x358 */ Vec3f unk_358[12];
/* 0x3E8 */ Vec3s jointTable[30];
/* 0x49C */ Vec3s morphTable[30];
} EnSt; // size = 0x550
extern const ActorInit En_St_InitVars;

2
tools/disasm/functions.txt
View File

@ -5736,7 +5736,7 @@
0x808A7138:("EnSt_Init",),
0x808A71D0:("EnSt_Destroy",),
0x808A7230:("EnSt_Update",),
0x808A73E8:("func_808A73E8",),
0x808A73E8:("EnSt_OverrideLimbDraw",),
0x808A7478:("func_808A7478",),
0x808A7930:("ObjWturn_Init",),
0x808A7954:("func_808A7954",),

4
undefined_syms.txt
View File

@ -3450,10 +3450,6 @@ D_06005850 = 0x06005850;
D_06005F78 = 0x06005F78;
D_06006470 = 0x06006470;
// ovl_En_St
D_06005298 = 0x06005298;
// ovl_En_Sth
D_060031F8 = 0x060031F8;