mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-06 14:20:11 +00:00
ovl_En_Zo OK (#522)
* Decompile ovl_En_Zo * Label ovl_En_Zo * clang-format * Cleanup * Review changes Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Use generated reloc Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Review Changes * Remove reloc data * Review changes Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
Synray
GitHub
parent
3237f176cd
commit
b0200efbeb
33 changed files with 776 additions and 2608 deletions
|
|
@ -10,22 +10,297 @@
|
|||
|
||||
#define THIS ((EnZo*)thisx)
|
||||
|
||||
typedef enum {
|
||||
/* 0 */ ENZO_EFFECT_NONE,
|
||||
/* 1 */ ENZO_EFFECT_RIPPLE,
|
||||
/* 2 */ ENZO_EFFECT_SPLASH,
|
||||
/* 3 */ ENZO_EFFECT_BUBBLE,
|
||||
} EnZoEffectType;
|
||||
|
||||
void EnZo_Init(Actor* thisx, GlobalContext* globalCtx);
|
||||
void EnZo_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
||||
void EnZo_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void EnZo_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
extern UNK_TYPE D_06000598;
|
||||
extern UNK_TYPE D_06000D48;
|
||||
extern UNK_TYPE D_060022F0;
|
||||
extern UNK_TYPE D_06002350;
|
||||
extern UNK_TYPE D_060024A0;
|
||||
extern UNK_TYPE D_06002510;
|
||||
extern UNK_TYPE D_0600BFA8;
|
||||
extern UNK_TYPE D_0600BFC0;
|
||||
extern UNK_TYPE D_0600C028;
|
||||
// Actions
|
||||
void EnZo_Standing(EnZo* this, GlobalContext* globalCtx);
|
||||
void EnZo_Submerged(EnZo* this, GlobalContext* globalCtx);
|
||||
void EnZo_Surface(EnZo* this, GlobalContext* globalCtx);
|
||||
void EnZo_TreadWater(EnZo* this, GlobalContext* globalCtx);
|
||||
void EnZo_Dive(EnZo* this, GlobalContext* globalCtx);
|
||||
|
||||
extern Gfx D_060022F0[];
|
||||
extern Gfx D_06002350[];
|
||||
extern Gfx D_060024A0[];
|
||||
extern Gfx D_06002510[];
|
||||
extern Gfx D_0600BFC0[];
|
||||
extern Gfx D_0600C028[];
|
||||
extern FlexSkeletonHeader D_0600BFA8;
|
||||
|
||||
extern AnimationHeader D_06002FE8;
|
||||
extern AnimationHeader D_06002F10;
|
||||
extern AnimationHeader D_0600219C;
|
||||
extern AnimationHeader D_06000598;
|
||||
extern AnimationHeader D_06000D48;
|
||||
|
||||
void EnZo_Ripple(EnZo* this, Vec3f* pos, f32 scale, f32 targetScale, u8 alpha) {
|
||||
EnZoEffect* effect;
|
||||
Vec3f vec = { 0.0f, 0.0f, 0.0f };
|
||||
s16 i;
|
||||
|
||||
effect = this->effects;
|
||||
for (i = 0; i < ARRAY_COUNT(this->effects); i++) {
|
||||
if (effect->type == ENZO_EFFECT_NONE) {
|
||||
effect->type = ENZO_EFFECT_RIPPLE;
|
||||
effect->pos = *pos;
|
||||
effect->scale = scale;
|
||||
effect->targetScale = targetScale;
|
||||
effect->color.a = alpha;
|
||||
break;
|
||||
}
|
||||
effect++;
|
||||
}
|
||||
}
|
||||
|
||||
void EnZo_Bubble(EnZo* this, Vec3f* pos) {
|
||||
EnZoEffect* effect;
|
||||
Vec3f vec = { 0.0f, 0.0f, 0.0f };
|
||||
Vec3f vel = { 0.0f, 1.0f, 0.0f };
|
||||
s16 i;
|
||||
f32 waterSurface;
|
||||
|
||||
effect = this->effects;
|
||||
for (i = 0; i < ARRAY_COUNT(this->effects); i++) {
|
||||
if (1) {}
|
||||
if (effect->type == ENZO_EFFECT_NONE) {
|
||||
waterSurface = this->actor.posRot.pos.y + this->actor.waterY;
|
||||
if (!(waterSurface <= pos->y)) {
|
||||
effect->type = ENZO_EFFECT_BUBBLE;
|
||||
effect->pos = *pos;
|
||||
effect->vec = *pos;
|
||||
effect->vel = vel;
|
||||
effect->scale = ((Math_Rand_ZeroOne() - 0.5f) * 0.02f) + 0.12f;
|
||||
break;
|
||||
}
|
||||
}
|
||||
effect++;
|
||||
}
|
||||
}
|
||||
|
||||
void EnZo_Splash(EnZo* this, Vec3f* pos, Vec3f* vel, f32 scale) {
|
||||
EnZoEffect* effect;
|
||||
Vec3f accel = { 0.0f, -1.0f, 0.0f };
|
||||
s16 i;
|
||||
|
||||
effect = this->effects;
|
||||
for (i = 0; i < ARRAY_COUNT(this->effects); i++) {
|
||||
if (1) {}
|
||||
if (effect->type != ENZO_EFFECT_SPLASH) {
|
||||
effect->type = ENZO_EFFECT_SPLASH;
|
||||
effect->pos = *pos;
|
||||
effect->vec = accel;
|
||||
effect->vel = *vel;
|
||||
effect->color.a = (Math_Rand_ZeroOne() * 100.0f) + 100.0f;
|
||||
effect->scale = scale;
|
||||
break;
|
||||
}
|
||||
effect++;
|
||||
}
|
||||
}
|
||||
|
||||
void EnZo_UpdateRipples(EnZo* this) {
|
||||
EnZoEffect* effect = this->effects;
|
||||
s16 i;
|
||||
|
||||
for (i = 0; i < ARRAY_COUNT(this->effects); i++) {
|
||||
if (effect->type == ENZO_EFFECT_RIPPLE) {
|
||||
Math_SmoothScaleMaxF(&effect->scale, effect->targetScale, 0.2f, 0.8f);
|
||||
if (effect->color.a > 20) {
|
||||
effect->color.a -= 20;
|
||||
} else {
|
||||
effect->color.a = 0;
|
||||
}
|
||||
|
||||
if (effect->color.a == 0) {
|
||||
effect->type = ENZO_EFFECT_NONE;
|
||||
}
|
||||
}
|
||||
effect++;
|
||||
}
|
||||
}
|
||||
|
||||
void EnZo_UpdateBubbles(EnZo* this) {
|
||||
EnZoEffect* effect;
|
||||
f32 waterSurface;
|
||||
s16 i;
|
||||
|
||||
effect = this->effects;
|
||||
for (i = 0; i < ARRAY_COUNT(this->effects); i++) {
|
||||
if (effect->type == ENZO_EFFECT_BUBBLE) {
|
||||
effect->pos.x = ((Math_Rand_ZeroOne() * 0.5f) - 0.25f) + effect->vec.x;
|
||||
effect->pos.z = ((Math_Rand_ZeroOne() * 0.5f) - 0.25f) + effect->vec.z;
|
||||
effect->pos.y += effect->vel.y;
|
||||
|
||||
// Bubbles turn into ripples when they reach the surface
|
||||
waterSurface = this->actor.posRot.pos.y + this->actor.waterY;
|
||||
if (waterSurface <= effect->pos.y) {
|
||||
effect->type = ENZO_EFFECT_NONE;
|
||||
effect->pos.y = waterSurface;
|
||||
EnZo_Ripple(this, &effect->pos, 0.06f, 0.12f, 200);
|
||||
}
|
||||
}
|
||||
effect++;
|
||||
}
|
||||
}
|
||||
|
||||
void EnZo_UpdateSplashes(EnZo* this) {
|
||||
EnZoEffect* effect;
|
||||
f32 waterSurface;
|
||||
s16 i;
|
||||
|
||||
effect = this->effects;
|
||||
for (i = 0; i < ARRAY_COUNT(this->effects); i++) {
|
||||
if (effect->type == ENZO_EFFECT_SPLASH) {
|
||||
effect->pos.x += effect->vel.x;
|
||||
effect->pos.y += effect->vel.y;
|
||||
effect->pos.z += effect->vel.z;
|
||||
|
||||
if (effect->vel.y >= -20.0f) {
|
||||
effect->vel.y += effect->vec.y;
|
||||
} else {
|
||||
effect->vel.y = -20.0f;
|
||||
effect->vec.y = 0.0f;
|
||||
}
|
||||
|
||||
// Splash particles turn into ripples when they hit the surface
|
||||
waterSurface = this->actor.posRot.pos.y + this->actor.waterY;
|
||||
if (effect->pos.y < waterSurface) {
|
||||
effect->type = ENZO_EFFECT_NONE;
|
||||
effect->pos.y = waterSurface;
|
||||
EnZo_Ripple(this, &effect->pos, 0.06f, 0.12f, 200);
|
||||
}
|
||||
}
|
||||
effect++;
|
||||
}
|
||||
}
|
||||
|
||||
void EnZo_DrawRipples(EnZo* this, GlobalContext* globalCtx) {
|
||||
EnZoEffect* effect;
|
||||
s16 i;
|
||||
u8 setup;
|
||||
|
||||
effect = this->effects;
|
||||
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_zo_eff.c", 217);
|
||||
setup = false;
|
||||
func_80093D84(globalCtx->state.gfxCtx);
|
||||
for (i = 0; i < ARRAY_COUNT(this->effects); i++) {
|
||||
if (effect->type == ENZO_EFFECT_RIPPLE) {
|
||||
if (!setup) {
|
||||
if (1) {}
|
||||
gDPPipeSync(POLY_XLU_DISP++);
|
||||
gSPDisplayList(POLY_XLU_DISP++, D_0600BFC0);
|
||||
gDPSetEnvColor(POLY_XLU_DISP++, 155, 155, 155, 0);
|
||||
setup = true;
|
||||
}
|
||||
|
||||
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, effect->color.a);
|
||||
Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
|
||||
Matrix_Scale(effect->scale, 1.0f, effect->scale, MTXMODE_APPLY);
|
||||
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_zo_eff.c", 242),
|
||||
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
gSPDisplayList(POLY_XLU_DISP++, D_0600C028);
|
||||
}
|
||||
effect++;
|
||||
}
|
||||
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_zo_eff.c", 248);
|
||||
}
|
||||
|
||||
void EnZo_DrawBubbles(EnZo* this, GlobalContext* globalCtx) {
|
||||
EnZoEffect* effect;
|
||||
s16 i;
|
||||
u8 setup;
|
||||
|
||||
effect = this->effects;
|
||||
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_zo_eff.c", 260);
|
||||
setup = false;
|
||||
func_80093D84(globalCtx->state.gfxCtx);
|
||||
for (i = 0; i < ARRAY_COUNT(this->effects); i++) {
|
||||
if (effect->type == ENZO_EFFECT_BUBBLE) {
|
||||
if (!setup) {
|
||||
if (1) {}
|
||||
gSPDisplayList(POLY_XLU_DISP++, D_060022F0);
|
||||
gDPPipeSync(POLY_XLU_DISP++);
|
||||
gDPSetEnvColor(POLY_XLU_DISP++, 150, 150, 150, 0);
|
||||
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255);
|
||||
|
||||
setup = true;
|
||||
}
|
||||
|
||||
Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
|
||||
func_800D1FD4(&globalCtx->mf_11DA0);
|
||||
Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
|
||||
|
||||
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_zo_eff.c", 281),
|
||||
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
gSPDisplayList(POLY_XLU_DISP++, D_06002350);
|
||||
}
|
||||
effect++;
|
||||
}
|
||||
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_zo_eff.c", 286);
|
||||
}
|
||||
|
||||
void EnZo_DrawSplashes(EnZo* this, GlobalContext* globalCtx) {
|
||||
EnZoEffect* effect;
|
||||
s16 i;
|
||||
u8 setup;
|
||||
|
||||
effect = this->effects;
|
||||
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_zo_eff.c", 298);
|
||||
setup = false;
|
||||
func_80093D84(globalCtx->state.gfxCtx);
|
||||
for (i = 0; i < ARRAY_COUNT(this->effects); i++) {
|
||||
if (effect->type == ENZO_EFFECT_SPLASH) {
|
||||
if (!setup) {
|
||||
if (1) {}
|
||||
gSPDisplayList(POLY_XLU_DISP++, D_060024A0);
|
||||
gDPPipeSync(POLY_XLU_DISP++);
|
||||
gDPSetEnvColor(POLY_XLU_DISP++, 200, 200, 200, 0);
|
||||
setup = true;
|
||||
}
|
||||
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 180, 180, 180, effect->color.a);
|
||||
|
||||
Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
|
||||
func_800D1FD4(&globalCtx->mf_11DA0);
|
||||
Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
|
||||
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_zo_eff.c", 325),
|
||||
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
|
||||
gSPDisplayList(POLY_XLU_DISP++, D_06002510);
|
||||
}
|
||||
effect++;
|
||||
}
|
||||
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_zo_eff.c", 331);
|
||||
}
|
||||
|
||||
void EnZo_TreadWaterRipples(EnZo* this, f32 scale, f32 targetScale, u8 alpha) {
|
||||
Vec3f pos = { 0.0f, 0.0f, 0.0f };
|
||||
|
||||
pos.x = this->actor.posRot.pos.x;
|
||||
pos.y = this->actor.posRot.pos.y + this->actor.waterY;
|
||||
pos.z = this->actor.posRot.pos.z;
|
||||
EnZo_Ripple(this, &pos, scale, targetScale, alpha);
|
||||
}
|
||||
|
||||
static ColliderCylinderInit sCylinderInit = {
|
||||
{ COLTYPE_UNK10, 0x00, 0x00, 0x39, 0x20, COLSHAPE_CYLINDER, },
|
||||
{ 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, 0x00, 0x00, 0x01 },
|
||||
{ 0x1A, 0x40, 0, { 0, 0, 0 } },
|
||||
};
|
||||
|
||||
static CollisionCheckInfoInit2 sColChkInit = {
|
||||
0x00, 0x0000, 0x0000, 0x0000, 0xFF,
|
||||
};
|
||||
|
||||
/*
|
||||
const ActorInit En_Zo_InitVars = {
|
||||
ACTOR_EN_ZO,
|
||||
ACTORTYPE_NPC,
|
||||
|
|
@ -37,59 +312,490 @@ const ActorInit En_Zo_InitVars = {
|
|||
(ActorFunc)EnZo_Update,
|
||||
(ActorFunc)EnZo_Draw,
|
||||
};
|
||||
*/
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60220.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B602B4.s")
|
||||
static struct_80034EC0_Entry sAnimations[] = {
|
||||
{ &D_06002FE8, 1.0f, 0.0f, -1.0f, 0, -8.0f, },
|
||||
{ &D_06002FE8, 1.0f, 0.0f, -1.0f, 0, 0.0f, },
|
||||
{ &D_06002F10, 0.0f, 1.0f, 1.0f, 2, 0.0f, },
|
||||
{ &D_06002F10, 1.0f, 1.0f, -1.0f, 0, -8.0f, },
|
||||
{ &D_06002F10, 1.0f, 8.0f, -1.0f, 0, -8.0f, },
|
||||
{ &D_0600219C, 1.0f, 0.0f, -1.0f, 0, -8.0f, },
|
||||
{ &D_06000598, 1.0f, 0.0f, -1.0f, 0, -8.0f, },
|
||||
{ &D_06000D48, 1.0f, 0.0f, -1.0f, 0, -8.0f, },
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B603E4.s")
|
||||
void EnZo_SpawnSplashes(EnZo* this) {
|
||||
Vec3f pos;
|
||||
Vec3f vel;
|
||||
s32 i;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60550.s")
|
||||
// Convert 20 particles into splashes (all of them since there are only 15)
|
||||
for (i = 0; i < 20; i++) {
|
||||
f32 speed = Math_Rand_ZeroOne() * 1.5f + 0.5f;
|
||||
f32 angle = Math_Rand_ZeroOne() * 6.28f; // ~pi * 2
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B6060C.s")
|
||||
vel.y = Math_Rand_ZeroOne() * 3.0f + 3.0f;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B6073C.s")
|
||||
vel.x = sinf(angle) * speed;
|
||||
vel.z = cosf(angle) * speed;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60874.s")
|
||||
pos = this->actor.posRot.pos;
|
||||
pos.x += vel.x * 6.0f;
|
||||
pos.z += vel.z * 6.0f;
|
||||
pos.y += this->actor.waterY;
|
||||
EnZo_Splash(this, &pos, &vel, 0.08f);
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60A60.s")
|
||||
u16 func_80B61024(GlobalContext* globalCtx, Actor* thisx) {
|
||||
u16 textId;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60C44.s")
|
||||
textId = Text_GetFaceReaction(globalCtx, 29);
|
||||
if (textId != 0) {
|
||||
return textId;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60E34.s")
|
||||
switch (thisx->params & 0x3F) {
|
||||
case 8:
|
||||
if (gSaveContext.eventChkInf[3] & 1) {
|
||||
return 0x402A;
|
||||
}
|
||||
break;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60EB0.s")
|
||||
case 6:
|
||||
return 0x4020;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61024.s")
|
||||
case 7:
|
||||
return 0x4021;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61298.s")
|
||||
case 0:
|
||||
if (CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE)) {
|
||||
return 0x402D;
|
||||
}
|
||||
if (gSaveContext.eventChkInf[3] & 1) {
|
||||
return 0x4007;
|
||||
}
|
||||
break;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B613F8.s")
|
||||
case 1:
|
||||
if (CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE)) {
|
||||
return 0x402E;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61470.s")
|
||||
if (gSaveContext.eventChkInf[3] & 1) {
|
||||
return (gSaveContext.infTable[18] & 0x10) ? 0x4009 : 0x4008;
|
||||
}
|
||||
break;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B6154C.s")
|
||||
case 2:
|
||||
if (CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE)) {
|
||||
return 0x402D;
|
||||
}
|
||||
if (gSaveContext.eventChkInf[3] & 2) {
|
||||
return (gSaveContext.infTable[18] & 0x200) ? 0x400B : 0x402F;
|
||||
}
|
||||
if (gSaveContext.eventChkInf[3] & 1) {
|
||||
return 0x400A;
|
||||
}
|
||||
break;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B615E4.s")
|
||||
case 3:
|
||||
if (CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE)) {
|
||||
return 0x402E;
|
||||
}
|
||||
if (gSaveContext.eventChkInf[3] & 1) {
|
||||
return 0x400C;
|
||||
}
|
||||
break;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Init.s")
|
||||
case 4:
|
||||
if (CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE)) {
|
||||
return 0x402D;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Destroy.s")
|
||||
if (gSaveContext.eventChkInf[3] & 8) {
|
||||
return 0x4010;
|
||||
}
|
||||
if (gSaveContext.eventChkInf[3] & 1) {
|
||||
return 0x400F;
|
||||
}
|
||||
break;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B618F0.s")
|
||||
case 5:
|
||||
if (CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE)) {
|
||||
return 0x402E;
|
||||
}
|
||||
if (gSaveContext.eventChkInf[3] & 1) {
|
||||
return 0x4011;
|
||||
}
|
||||
break;
|
||||
}
|
||||
return 0x4006;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B619D4.s")
|
||||
s16 func_80B61298(GlobalContext* globalCtx, Actor* thisx) {
|
||||
switch (func_8010BDBC(&globalCtx->msgCtx)) {
|
||||
case 0:
|
||||
case 1:
|
||||
case 3:
|
||||
case 6:
|
||||
case 7:
|
||||
case 8:
|
||||
case 9:
|
||||
return 1;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61A14.s")
|
||||
case 2:
|
||||
switch (thisx->textId) {
|
||||
case 0x4020:
|
||||
case 0x4021:
|
||||
return 0;
|
||||
case 0x4008:
|
||||
gSaveContext.infTable[18] |= 0x10;
|
||||
break;
|
||||
case 0x402F:
|
||||
gSaveContext.infTable[18] |= 0x200;
|
||||
break;
|
||||
}
|
||||
gSaveContext.eventChkInf[3] |= 1;
|
||||
return 0;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61AF4.s")
|
||||
case 4:
|
||||
switch (func_80106BC8(globalCtx)) {
|
||||
case 0:
|
||||
return 1;
|
||||
default:
|
||||
if (thisx->textId == 0x400C) {
|
||||
thisx->textId = (globalCtx->msgCtx.choiceIndex == 0) ? 0x400D : 0x400E;
|
||||
func_8010B720(globalCtx, thisx->textId);
|
||||
}
|
||||
break;
|
||||
}
|
||||
return 1;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61CA4.s")
|
||||
case 5:
|
||||
switch (func_80106BC8(globalCtx)) {
|
||||
case 0:
|
||||
return 1;
|
||||
default:
|
||||
return 2;
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Update.s")
|
||||
return 1;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61FCC.s")
|
||||
void EnZo_Blink(EnZo* this) {
|
||||
if (DECR(this->blinkTimer) == 0) {
|
||||
this->eyeTexture++;
|
||||
if (this->eyeTexture >= 3) {
|
||||
this->blinkTimer = Math_Rand_S16Offset(30, 30);
|
||||
this->eyeTexture = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B621E4.s")
|
||||
void EnZo_Dialog(EnZo* this, GlobalContext* globalCtx) {
|
||||
Player* player = PLAYER;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Draw.s")
|
||||
this->unk_194.unk_18 = player->actor.posRot.pos;
|
||||
if (this->actionFunc == EnZo_Standing) {
|
||||
// Look down at link if young, look up if old
|
||||
this->unk_194.unk_14 = LINK_IS_CHILD ? 10.0f : -10.0f;
|
||||
} else {
|
||||
this->unk_194.unk_18.y = this->actor.posRot.pos.y;
|
||||
}
|
||||
func_80034A14(&this->actor, &this->unk_194, 11, this->unk_64C);
|
||||
if (this->canSpeak == true) {
|
||||
func_800343CC(globalCtx, &this->actor, &this->unk_194.unk_00, this->dialogRadius, func_80B61024, func_80B61298);
|
||||
}
|
||||
}
|
||||
|
||||
s32 EnZo_PlayerInProximity(EnZo* this, GlobalContext* globalCtx) {
|
||||
Player* player = PLAYER;
|
||||
Vec3f surfacePos;
|
||||
f32 yDist;
|
||||
f32 hDist;
|
||||
|
||||
surfacePos.x = this->actor.posRot.pos.x;
|
||||
surfacePos.y = this->actor.posRot.pos.y + this->actor.waterY;
|
||||
surfacePos.z = this->actor.posRot.pos.z;
|
||||
|
||||
hDist = Math_Vec3f_DistXZ(&surfacePos, &player->actor.posRot.pos);
|
||||
yDist = fabsf(player->actor.posRot.pos.y - surfacePos.y);
|
||||
|
||||
if (hDist < 240.0f && yDist < 80.0f) {
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
void EnZo_SetAnimation(EnZo* this) {
|
||||
s32 animId = 8;
|
||||
|
||||
if (this->skelAnime.animation == &D_06000598 || this->skelAnime.animation == &D_06000D48) {
|
||||
if (this->unk_194.unk_00 == 0) {
|
||||
if (this->actionFunc == EnZo_Standing) {
|
||||
animId = 0;
|
||||
} else {
|
||||
animId = 3;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (this->unk_194.unk_00 != 0 && this->actor.textId == 0x4006 && this->skelAnime.animation != &D_06000598) {
|
||||
animId = 6;
|
||||
}
|
||||
|
||||
if (this->unk_194.unk_00 != 0 && this->actor.textId == 0x4007 && this->skelAnime.animation != &D_06000D48) {
|
||||
animId = 7;
|
||||
}
|
||||
|
||||
if (animId != 8) {
|
||||
func_80034EC0(&this->skelAnime, sAnimations, animId);
|
||||
if (animId == 3) {
|
||||
this->skelAnime.animCurrentFrame = this->skelAnime.animFrameCount;
|
||||
this->skelAnime.animPlaybackSpeed = 0.0f;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void EnZo_Init(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnZo* this = THIS;
|
||||
|
||||
ActorShape_Init(&this->actor.shape, 0.0f, NULL, 0.0f);
|
||||
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600BFA8, NULL, this->limbDrawTbl, this->transitionDrawTbl, 20);
|
||||
Collider_InitCylinder(globalCtx, &this->collider);
|
||||
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
|
||||
func_80061EFC(&this->actor.colChkInfo, NULL, &sColChkInit);
|
||||
|
||||
if (LINK_IS_ADULT && ((this->actor.params & 0x3F) == 8)) {
|
||||
Actor_Kill(&this->actor);
|
||||
return;
|
||||
}
|
||||
|
||||
func_80034EC0(&this->skelAnime, sAnimations, 2);
|
||||
Actor_SetScale(&this->actor, 0.01f);
|
||||
this->actor.unk_1F = 6;
|
||||
this->dialogRadius = this->collider.dim.radius + 30.0f;
|
||||
this->unk_64C = 1;
|
||||
this->canSpeak = false;
|
||||
this->unk_194.unk_00 = 0;
|
||||
func_8002E4B4(globalCtx, &this->actor, this->collider.dim.height * 0.5f, this->collider.dim.radius, 0.0f, 5);
|
||||
|
||||
if (this->actor.waterY < 54.0f || (this->actor.params & 0x3F) == 8) {
|
||||
this->actor.shape.shadowDrawFunc = ActorShadow_DrawFunc_Circle;
|
||||
this->actor.shape.unk_10 = 24.0f;
|
||||
func_80034EC0(&this->skelAnime, sAnimations, 1);
|
||||
this->canSpeak = true;
|
||||
this->alpha = 255.0f;
|
||||
this->actionFunc = EnZo_Standing;
|
||||
} else {
|
||||
this->actor.flags &= ~1;
|
||||
this->actionFunc = EnZo_Submerged;
|
||||
}
|
||||
}
|
||||
|
||||
void EnZo_Destroy(Actor* thisx, GlobalContext* globalCtx) {
|
||||
}
|
||||
|
||||
void EnZo_Standing(EnZo* this, GlobalContext* globalCtx) {
|
||||
s16 angle;
|
||||
|
||||
func_80034F54(globalCtx, this->unk_656, this->unk_67E, 20);
|
||||
EnZo_SetAnimation(this);
|
||||
if (this->unk_194.unk_00 != 0) {
|
||||
this->unk_64C = 4;
|
||||
return;
|
||||
}
|
||||
|
||||
angle = ABS((s16)((f32)this->actor.yawTowardsLink - (f32)this->actor.shape.rot.y));
|
||||
if (angle < 0x4718) {
|
||||
if (EnZo_PlayerInProximity(this, globalCtx)) {
|
||||
this->unk_64C = 2;
|
||||
} else {
|
||||
this->unk_64C = 1;
|
||||
}
|
||||
} else {
|
||||
this->unk_64C = 1;
|
||||
}
|
||||
}
|
||||
|
||||
void EnZo_Submerged(EnZo* this, GlobalContext* globalCtx) {
|
||||
if (EnZo_PlayerInProximity(this, globalCtx)) {
|
||||
this->actionFunc = EnZo_Surface;
|
||||
this->actor.velocity.y = 4.0f;
|
||||
}
|
||||
}
|
||||
|
||||
void EnZo_Surface(EnZo* this, GlobalContext* globalCtx) {
|
||||
if (this->actor.waterY < 54.0f) {
|
||||
Audio_PlayActorSound2(&this->actor, NA_SE_EV_OUT_OF_WATER);
|
||||
EnZo_SpawnSplashes(this);
|
||||
func_80034EC0(&this->skelAnime, sAnimations, 3);
|
||||
this->actor.flags |= 1;
|
||||
this->actionFunc = EnZo_TreadWater;
|
||||
this->actor.velocity.y = 0.0f;
|
||||
this->alpha = 255.0f;
|
||||
} else if (this->actor.waterY < 80.0f) {
|
||||
Math_SmoothScaleMaxF(&this->actor.velocity.y, 2.0f, 0.4f, 0.6f);
|
||||
Math_SmoothScaleMaxF(&this->alpha, 255.0f, 0.3f, 10.0f);
|
||||
}
|
||||
}
|
||||
|
||||
void EnZo_TreadWater(EnZo* this, GlobalContext* globalCtx) {
|
||||
func_80034F54(globalCtx, this->unk_656, this->unk_67E, 20);
|
||||
if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount) != 0) {
|
||||
this->canSpeak = true;
|
||||
this->unk_64C = 4;
|
||||
this->skelAnime.animPlaybackSpeed = 0.0f;
|
||||
}
|
||||
EnZo_SetAnimation(this);
|
||||
|
||||
Math_SmoothScaleMaxF(&this->actor.velocity.y, this->actor.waterY < 54.0f ? -0.6f : 0.6f, 0.3f, 0.2f);
|
||||
if (this->rippleTimer != 0) {
|
||||
this->rippleTimer--;
|
||||
if ((this->rippleTimer == 3) || (this->rippleTimer == 6)) {
|
||||
EnZo_TreadWaterRipples(this, 0.2f, 1.0f, 200);
|
||||
}
|
||||
} else {
|
||||
EnZo_TreadWaterRipples(this, 0.2f, 1.0f, 200);
|
||||
this->rippleTimer = 12;
|
||||
}
|
||||
|
||||
if (EnZo_PlayerInProximity(this, globalCtx) != 0) {
|
||||
this->timeToDive = Math_Rand_S16Offset(40, 40);
|
||||
} else if (DECR(this->timeToDive) == 0) {
|
||||
f32 initialFrame;
|
||||
func_80034EC0(&this->skelAnime, sAnimations, 4);
|
||||
this->canSpeak = false;
|
||||
this->unk_64C = 1;
|
||||
this->actionFunc = EnZo_Dive;
|
||||
initialFrame = this->skelAnime.initialFrame;
|
||||
this->skelAnime.initialFrame = this->skelAnime.animFrameCount;
|
||||
this->skelAnime.animCurrentFrame = this->skelAnime.animFrameCount;
|
||||
this->skelAnime.animFrameCount = initialFrame;
|
||||
this->skelAnime.animPlaybackSpeed = -1.0f;
|
||||
}
|
||||
}
|
||||
|
||||
void EnZo_Dive(EnZo* this, GlobalContext* globalCtx) {
|
||||
if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount) != 0) {
|
||||
Audio_PlayActorSound2(&this->actor, NA_SE_EV_DIVE_WATER);
|
||||
EnZo_SpawnSplashes(this);
|
||||
this->actor.flags &= ~1;
|
||||
this->actor.velocity.y = -4.0f;
|
||||
this->skelAnime.animPlaybackSpeed = 0.0f;
|
||||
}
|
||||
|
||||
if (this->skelAnime.animPlaybackSpeed > 0.0f) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (this->actor.waterY > 80.0f || this->actor.bgCheckFlags & 1) {
|
||||
Math_SmoothScaleMaxF(&this->actor.velocity.y, -1.0f, 0.4f, 0.6f);
|
||||
Math_SmoothScaleMaxF(&this->alpha, 0.0f, 0.3f, 10.0f);
|
||||
}
|
||||
|
||||
if ((s16)this->alpha == 0) {
|
||||
func_80034EC0(&this->skelAnime, sAnimations, 2);
|
||||
this->actor.posRot.pos = this->actor.initPosRot.pos;
|
||||
this->alpha = 0.0f;
|
||||
this->actionFunc = EnZo_Submerged;
|
||||
}
|
||||
}
|
||||
|
||||
void EnZo_Update(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnZo* this = THIS;
|
||||
u32 pad;
|
||||
Vec3f pos;
|
||||
|
||||
if ((s32)this->alpha != 0) {
|
||||
SkelAnime_FrameUpdateMatrix(&this->skelAnime);
|
||||
EnZo_Blink(this);
|
||||
}
|
||||
|
||||
Actor_MoveForward(thisx);
|
||||
func_8002E4B4(globalCtx, thisx, this->collider.dim.radius, this->collider.dim.height * 0.25f, 0.0f, 5);
|
||||
this->actionFunc(this, globalCtx);
|
||||
EnZo_Dialog(this, globalCtx);
|
||||
|
||||
// Spawn air bubbles
|
||||
if (globalCtx->state.frames & 8) {
|
||||
pos = this->actor.posRot.pos;
|
||||
|
||||
pos.y += (Math_Rand_ZeroOne() - 0.5f) * 10.0f + 18.0f;
|
||||
pos.x += (Math_Rand_ZeroOne() - 0.5f) * 28.0f;
|
||||
pos.z += (Math_Rand_ZeroOne() - 0.5f) * 28.0f;
|
||||
EnZo_Bubble(this, &pos);
|
||||
}
|
||||
|
||||
if ((s32)this->alpha != 0) {
|
||||
Collider_CylinderUpdate(thisx, &this->collider);
|
||||
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
|
||||
}
|
||||
|
||||
EnZo_UpdateRipples(this);
|
||||
EnZo_UpdateBubbles(this);
|
||||
EnZo_UpdateSplashes(this);
|
||||
}
|
||||
|
||||
s32 EnZo_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx,
|
||||
Gfx** gfx) {
|
||||
EnZo* this = THIS;
|
||||
Vec3s vec;
|
||||
|
||||
if (limbIndex == 15) {
|
||||
Matrix_Translate(1800.0f, 0.0f, 0.0f, MTXMODE_APPLY);
|
||||
vec = this->unk_194.unk_08;
|
||||
Matrix_RotateX((vec.y / 32768.0f) * M_PI, MTXMODE_APPLY);
|
||||
Matrix_RotateZ((vec.x / 32768.0f) * M_PI, MTXMODE_APPLY);
|
||||
Matrix_Translate(-1800.0f, 0.0f, 0.0f, MTXMODE_APPLY);
|
||||
}
|
||||
|
||||
if (limbIndex == 8) {
|
||||
vec = this->unk_194.unk_0E;
|
||||
Matrix_RotateX((-vec.y / 32768.0f) * M_PI, MTXMODE_APPLY);
|
||||
Matrix_RotateZ((vec.x / 32768.0f) * M_PI, MTXMODE_APPLY);
|
||||
}
|
||||
|
||||
if ((limbIndex == 8) || (limbIndex == 9) || (limbIndex == 12)) {
|
||||
rot->y += (Math_Sins(this->unk_656[limbIndex]) * 200.0f);
|
||||
rot->z += (Math_Coss(this->unk_67E[limbIndex]) * 200.0f);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void EnZo_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, Gfx** gfx) {
|
||||
EnZo* this = THIS;
|
||||
Vec3f vec = { 0.0f, 600.0f, 0.0f };
|
||||
|
||||
if (limbIndex == 15) {
|
||||
Matrix_MultVec3f(&vec, &this->actor.posRot2.pos);
|
||||
}
|
||||
}
|
||||
|
||||
void EnZo_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnZo* this = THIS;
|
||||
UNK_PTR eyeTextures[] = { 0x06003E40, 0x06004640, 0x06004E40 };
|
||||
|
||||
Matrix_Push();
|
||||
EnZo_DrawRipples(this, globalCtx);
|
||||
EnZo_DrawBubbles(this, globalCtx);
|
||||
EnZo_DrawSplashes(this, globalCtx);
|
||||
Matrix_Pull();
|
||||
|
||||
if ((s32)this->alpha != 0) {
|
||||
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_zo.c", 1008);
|
||||
|
||||
if (this->alpha == 255.0f) {
|
||||
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeTexture]));
|
||||
func_80034BA0(globalCtx, &this->skelAnime, EnZo_OverrideLimbDraw, EnZo_PostLimbDraw, thisx, this->alpha);
|
||||
} else {
|
||||
gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeTexture]));
|
||||
func_80034CC4(globalCtx, &this->skelAnime, EnZo_OverrideLimbDraw, EnZo_PostLimbDraw, thisx, this->alpha);
|
||||
}
|
||||
|
||||
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_zo.c", 1025);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,9 +6,38 @@
|
|||
|
||||
struct EnZo;
|
||||
|
||||
typedef struct {
|
||||
/* 0x00 */ u8 type;
|
||||
/* 0x04 */ f32 scale;
|
||||
/* 0x08 */ f32 targetScale;
|
||||
/* 0x0C */ Color_RGBA8 color;
|
||||
/* 0x10 */ u32 pad;
|
||||
/* 0x14 */ Vec3f pos;
|
||||
/* 0x20 */ Vec3f vel;
|
||||
/* 0x2C */ Vec3f vec; // Usage specific
|
||||
} EnZoEffect; // size = 0x38
|
||||
|
||||
typedef void (*EnZoActionFunc)(struct EnZo*, GlobalContext*);
|
||||
|
||||
typedef struct EnZo {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ char unk_14C[0x55C];
|
||||
/* 0x014C */ SkelAnime skelAnime;
|
||||
/* 0x0190 */ EnZoActionFunc actionFunc;
|
||||
/* 0x0194 */ struct_80034A14_arg1 unk_194;
|
||||
/* 0x01BC */ ColliderCylinder collider;
|
||||
/* 0x0208 */ u8 canSpeak;
|
||||
/* 0x020A */ Vec3s limbDrawTbl[20];
|
||||
/* 0x0282 */ Vec3s transitionDrawTbl[20];
|
||||
/* 0x02FC */ EnZoEffect effects[15];
|
||||
/* 0x0644 */ f32 dialogRadius;
|
||||
/* 0x0648 */ f32 alpha;
|
||||
/* 0x064C */ s16 unk_64C;
|
||||
/* 0x064E */ s16 rippleTimer;
|
||||
/* 0x0650 */ s16 timeToDive;
|
||||
/* 0x0652 */ s16 blinkTimer;
|
||||
/* 0x0654 */ s16 eyeTexture;
|
||||
/* 0x0656 */ s16 unk_656[20];
|
||||
/* 0x067E */ s16 unk_67E[20];
|
||||
} EnZo; // size = 0x06A8
|
||||
|
||||
extern const ActorInit En_Zo_InitVars;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue