mirror of
https://github.com/zeldaret/oot.git
synced 2025-07-16 12:54:40 +00:00
Kelebek1
GitHub
parent
741c140aef
commit
00836ddebc
11 changed files with 241 additions and 495 deletions
|
|
@ -1649,7 +1649,7 @@ u32 func_8002F674(GlobalContext* globalCtx, Actor* actor) {
|
|||
}
|
||||
}
|
||||
|
||||
void func_8002F698(GlobalContext* globalCtx, u32 arg1, f32 arg2, s16 arg3, f32 arg4, u32 arg5, u32 arg6) {
|
||||
void func_8002F698(GlobalContext* globalCtx, Actor* arg1, f32 arg2, s16 arg3, f32 arg4, u32 arg5, u32 arg6) {
|
||||
Player* player = PLAYER;
|
||||
player->unk_8A0 = arg6;
|
||||
player->unk_8A1 = arg5;
|
||||
|
|
@ -1658,19 +1658,19 @@ void func_8002F698(GlobalContext* globalCtx, u32 arg1, f32 arg2, s16 arg3, f32 a
|
|||
player->unk_8A8 = arg4;
|
||||
}
|
||||
|
||||
void func_8002F6D4(GlobalContext* globalCtx, u32 arg1, f32 arg2, s16 arg3, f32 arg4, u32 arg5) {
|
||||
void func_8002F6D4(GlobalContext* globalCtx, Actor* arg1, f32 arg2, s16 arg3, f32 arg4, u32 arg5) {
|
||||
func_8002F698(globalCtx, arg1, arg2, arg3, arg4, 2, arg5);
|
||||
}
|
||||
|
||||
void func_8002F71C(GlobalContext* globalCtx, u32 arg1, f32 arg2, s16 arg3, f32 arg4) {
|
||||
void func_8002F71C(GlobalContext* globalCtx, Actor* arg1, f32 arg2, s16 arg3, f32 arg4) {
|
||||
func_8002F6D4(globalCtx, arg1, arg2, arg3, arg4, 0);
|
||||
}
|
||||
|
||||
void func_8002F758(GlobalContext* globalCtx, u32 arg1, f32 arg2, s16 arg3, f32 arg4, u32 arg5) {
|
||||
void func_8002F758(GlobalContext* globalCtx, Actor* arg1, f32 arg2, s16 arg3, f32 arg4, u32 arg5) {
|
||||
func_8002F698(globalCtx, arg1, arg2, arg3, arg4, 1, arg5);
|
||||
}
|
||||
|
||||
void func_8002F7A0(GlobalContext* globalCtx, u32 arg1, f32 arg2, s16 arg3, f32 arg4) {
|
||||
void func_8002F7A0(GlobalContext* globalCtx, Actor* arg1, f32 arg2, s16 arg3, f32 arg4) {
|
||||
func_8002F758(globalCtx, arg1, arg2, arg3, arg4, 0);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,9 @@
|
|||
/*
|
||||
* File: z_en_bx.c
|
||||
* Overlay: ovl_En_Bx
|
||||
* Description: Jabu-Jabu Electrified Tentacle
|
||||
*/
|
||||
|
||||
#include "z_en_bx.h"
|
||||
|
||||
#define FLAGS 0x00000010
|
||||
|
|
@ -9,7 +15,8 @@ void EnBx_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
|||
void EnBx_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void EnBx_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
extern Gfx D_060022F0[];
|
||||
|
||||
const ActorInit En_Bx_InitVars = {
|
||||
ACTOR_EN_BX,
|
||||
ACTORTYPE_ENEMY,
|
||||
|
|
@ -21,13 +28,216 @@ const ActorInit En_Bx_InitVars = {
|
|||
(ActorFunc)EnBx_Update,
|
||||
(ActorFunc)EnBx_Draw,
|
||||
};
|
||||
*/
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Init.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Destroy.s")
|
||||
static ColliderCylinderInit sCylinderInit = {
|
||||
{ COLTYPE_UNK6, 0x11, 0x09, 0x00, 0x00, COLSHAPE_CYLINDER },
|
||||
{ 0x01, { 0xFFCFFFFF, 0x03, 0x04 }, { 0xFFCFFFFF, 0x01, 0x00 }, 0x01, 0x01, 0x00 },
|
||||
{ 60, 100, 100, { 0, 0, 0 } },
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bx/func_809D1D0C.s")
|
||||
static ColliderQuadInit sQuadInit = {
|
||||
{ COLTYPE_UNK10, 0x11, 0x00, 0x00, 0x00, COLSHAPE_QUAD },
|
||||
{ 0x00, { 0xFFCFFFFF, 0x03, 0x04 }, { 0x00000000, 0x00, 0x00 }, 0x01, 0x00, 0x00 },
|
||||
{ { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } },
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Update.s")
|
||||
Vec3f D_809D250C = { 0.015f, 0.015f, 0.015f };
|
||||
|
||||
Vec3f D_809D2518 = { 0.0f, 0.0f, 0.0f };
|
||||
|
||||
static InitChainEntry sInitChain[] = {
|
||||
ICHAIN_F32(unk_4C, 5300, ICHAIN_STOP),
|
||||
};
|
||||
|
||||
Vec3f D_809D2528 = { 8000.0f, 15000.0f, 2500.0f };
|
||||
|
||||
Vec3f D_809D2534 = { 8000.0f, 10000.0f, 2500.0f };
|
||||
|
||||
Vec3f D_809D2540 = { -8000.0f, 15000.0f, 2500.0f };
|
||||
|
||||
Vec3f D_809D254C = { -8000.0f, 10000.0f, 2500.0f };
|
||||
|
||||
Color_RGBA8 D_809D2558 = { 255, 255, 255, 255 };
|
||||
Color_RGBA8 D_809D255C = { 200, 255, 255, 255 };
|
||||
|
||||
UNK_PTR D_809D2560[] = { 0x060024F0, 0x060027F0, 0x060029F0 };
|
||||
|
||||
void EnBx_Init(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnBx* this = THIS;
|
||||
Vec3f sp48 = D_809D250C;
|
||||
Vec3f sp3C = D_809D2518;
|
||||
s32 i;
|
||||
s32 pad;
|
||||
|
||||
Actor_ProcessInitChain(&this->actor, sInitChain);
|
||||
thisx->scale.x = thisx->scale.z = 0.01f;
|
||||
thisx->scale.y = 0.03f;
|
||||
|
||||
thisx->posRot.pos.y = thisx->posRot.pos.y - 100.0f;
|
||||
for (i = 0; i < 4; i++) {
|
||||
this->unk_184[i] = sp48;
|
||||
if (i == 0) {
|
||||
this->unk_1B4[i].x = thisx->shape.rot.x - 0x4000;
|
||||
}
|
||||
this->unk_154[i] = thisx->posRot.pos;
|
||||
this->unk_154[i].y = thisx->posRot.pos.y + ((i + 1) * 140.0f);
|
||||
}
|
||||
|
||||
ActorShape_Init(&thisx->shape, 0.0f, ActorShadow_DrawFunc_Circle, 48.0f);
|
||||
Collider_InitCylinder(globalCtx, &this->collider);
|
||||
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
|
||||
Collider_InitQuad(globalCtx, &this->colliderQuad);
|
||||
Collider_SetQuad(globalCtx, &this->colliderQuad, &this->actor, &sQuadInit);
|
||||
thisx->colChkInfo.mass = 0xFF;
|
||||
this->unk_14C = 0;
|
||||
thisx->uncullZoneDownward = 2000.0f;
|
||||
if (Flags_GetSwitch(globalCtx, (thisx->params >> 8) & 0xFF)) {
|
||||
Actor_Kill(&this->actor);
|
||||
}
|
||||
thisx->params &= 0xFF;
|
||||
}
|
||||
|
||||
void EnBx_Destroy(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnBx* this = THIS;
|
||||
|
||||
Collider_DestroyCylinder(globalCtx, &this->collider);
|
||||
}
|
||||
|
||||
void func_809D1D0C(Actor* thisx, GlobalContext* globalCtx) {
|
||||
Vec3f sp5C = D_809D2528;
|
||||
Vec3f sp50 = D_809D2534;
|
||||
Vec3f sp44;
|
||||
Vec3f sp38;
|
||||
EnBx* this = THIS;
|
||||
|
||||
Matrix_MultVec3f(&D_809D2540, &sp44);
|
||||
Matrix_MultVec3f(&D_809D254C, &sp38);
|
||||
Matrix_MultVec3f(&sp5C, &this->colliderQuad.dim.quad[1]);
|
||||
Matrix_MultVec3f(&sp50, &this->colliderQuad.dim.quad[0]);
|
||||
func_80062734(&this->colliderQuad, &sp38, &sp44, &this->colliderQuad.dim.quad[0], &this->colliderQuad.dim.quad[1]);
|
||||
}
|
||||
|
||||
void EnBx_Update(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnBx* this = THIS;
|
||||
Player* player = PLAYER;
|
||||
s32 i;
|
||||
s16 tmp32;
|
||||
s32 tmp33;
|
||||
Vec3f sp58;
|
||||
s16 tmp16;
|
||||
u32 test;
|
||||
|
||||
if ((thisx->xzDistFromLink <= 70.0f) || (this->collider.base.atFlags & 2) || (this->collider.base.acFlags & 2) ||
|
||||
(this->colliderQuad.base.atFlags & 2)) {
|
||||
if ((thisx->xzDistFromLink <= 70.0f) || (&player->actor == this->collider.base.at) ||
|
||||
(&player->actor == this->collider.base.ac) || (&player->actor == this->colliderQuad.base.at)) {
|
||||
tmp33 = player->invincibilityTimer & 0xFF;
|
||||
tmp32 = thisx->posRot.rot.y;
|
||||
if (!(thisx->params & 0x80)) {
|
||||
tmp32 = thisx->yawTowardsLink;
|
||||
}
|
||||
if ((&player->actor != this->collider.base.at) && (&player->actor != this->collider.base.ac) &&
|
||||
(&player->actor != this->colliderQuad.base.at) && (player->invincibilityTimer <= 0)) {
|
||||
if (player->invincibilityTimer < -0x27) {
|
||||
player->invincibilityTimer = 0;
|
||||
} else {
|
||||
player->invincibilityTimer = 0;
|
||||
globalCtx->unk_11D58(globalCtx, -4);
|
||||
}
|
||||
}
|
||||
func_8002F71C(globalCtx, &this->actor, 6.0f, tmp32, 6.0f);
|
||||
player->invincibilityTimer = tmp33;
|
||||
}
|
||||
|
||||
this->collider.base.atFlags &= ~2;
|
||||
this->collider.base.acFlags &= ~2;
|
||||
this->colliderQuad.base.atFlags &= ~2;
|
||||
this->colliderQuad.base.at = NULL;
|
||||
this->collider.base.ac = NULL;
|
||||
this->collider.base.at = NULL;
|
||||
this->unk_14C = 0x14;
|
||||
}
|
||||
|
||||
if (this->unk_14C != 0) {
|
||||
this->unk_14C--;
|
||||
for (i = 0; i < 4; i++) {
|
||||
if (!((this->unk_14C + (i << 1)) % 4)) {
|
||||
tmp16 = (s32)Math_Rand_CenteredFloat(12288.0f);
|
||||
tmp16 = (tmp16 + (i * 16384)) + 0x2000;
|
||||
sp58.x = Math_Rand_CenteredFloat(5.0f) + thisx->posRot.pos.x;
|
||||
sp58.y = Math_Rand_CenteredFloat(30.0f) + thisx->posRot.pos.y + 170.0f;
|
||||
sp58.z = Math_Rand_CenteredFloat(5.0f) + thisx->posRot.pos.z;
|
||||
func_800295A0(globalCtx, &sp58, &D_809D2558, &D_809D255C, 0xE6, tmp16, 6, 0);
|
||||
}
|
||||
}
|
||||
|
||||
Audio_PlayActorSound2(thisx, NA_SE_EN_BIRI_SPARK - SFX_FLAG);
|
||||
}
|
||||
thisx->posRot2.pos = thisx->posRot.pos;
|
||||
Collider_CylinderUpdate(thisx, &this->collider);
|
||||
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
|
||||
CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
|
||||
if (thisx->params & 0x80) {
|
||||
CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->colliderQuad.base);
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef NON_MATCHING
|
||||
// Issue with Gfx_TwoTexScroll I think
|
||||
void EnBx_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnBx* this = THIS;
|
||||
void* matrices = Graph_Alloc(globalCtx->state.gfxCtx, 4 * sizeof(Mtx));
|
||||
f32 tmpf1;
|
||||
f32 tmpf2;
|
||||
|
||||
{
|
||||
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
|
||||
Gfx* dispRefs[4];
|
||||
Mtx* matrix = &matrices[0];
|
||||
s16 i;
|
||||
|
||||
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_bx.c", 464);
|
||||
func_80093D18(globalCtx->state.gfxCtx);
|
||||
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x0C, matrices);
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_809D2560[this->actor.params & 0x7F]));
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x09,
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 0x10, 0x10, 1, 0,
|
||||
(-globalCtx->gameplayFrames * 10) % 128, 0x20, 0x20));
|
||||
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bx.c", 478),
|
||||
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
|
||||
if (this->actor.params & 0x80) {
|
||||
func_809D1D0C(&this->actor, globalCtx);
|
||||
}
|
||||
|
||||
this->unk_14E -= 0xBB8;
|
||||
tmpf1 = Math_Coss(this->unk_14E);
|
||||
tmpf1 = (tmpf1 * 0.0075f) + 0.015f;
|
||||
thisx->scale.x = tmpf1;
|
||||
thisx->scale.z = tmpf1;
|
||||
|
||||
for (i = 3; i >= 0; i--) {
|
||||
tmpf2 = Math_Coss(this->unk_14E + ((i & 0xFF) * 8192));
|
||||
tmpf2 = (tmpf2 * 0.0075f) + 0.015f;
|
||||
this->unk_184[i].x = tmpf2;
|
||||
this->unk_184[i].z = tmpf2;
|
||||
this->unk_1B4[i].x = thisx->shape.rot.x;
|
||||
this->unk_1B4[i].y = thisx->shape.rot.y;
|
||||
this->unk_1B4[i].z = thisx->shape.rot.z;
|
||||
}
|
||||
|
||||
for (i = 0; i < 4; i++, matrix++) {
|
||||
Matrix_Translate(this->unk_154[i].x, this->unk_154[i].y, this->unk_154[i].z, MTXMODE_NEW);
|
||||
Matrix_RotateRPY(this->unk_1B4[i].x, this->unk_1B4[i].y, this->unk_1B4[i].z, MTXMODE_APPLY);
|
||||
Matrix_Scale(this->unk_184[i].x, this->unk_184[i].y, this->unk_184[i].z, MTXMODE_APPLY);
|
||||
Matrix_ToMtx(matrix, "../z_en_bx.c", 507);
|
||||
}
|
||||
|
||||
gSPDisplayList(gfxCtx->polyOpa.p++, D_060022F0);
|
||||
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_bx.c", 511);
|
||||
}
|
||||
}
|
||||
#else
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Draw.s")
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -8,7 +8,14 @@ struct EnBx;
|
|||
|
||||
typedef struct EnBx {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ char unk_14C[0x14C];
|
||||
/* 0x014C */ s16 unk_14C;
|
||||
/* 0x014E */ s16 unk_14E;
|
||||
/* 0x0150 */ char unk_150[0x4];
|
||||
/* 0x0154 */ Vec3f unk_154[4];
|
||||
/* 0x0184 */ Vec3f unk_184[4];
|
||||
/* 0x01B4 */ Vec3s unk_1B4[4];
|
||||
/* 0x01CC */ ColliderCylinder collider;
|
||||
/* 0x0218 */ ColliderQuad colliderQuad;
|
||||
} EnBx; // size = 0x0298
|
||||
|
||||
extern const ActorInit En_Bx_InitVars;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue