mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-06 06:10:21 +00:00
Bg haka huta OK (#682)
* starting haka_huta with new changes * matched last func, deleting asm * added changes from review
This commit is contained in:
Parker Burnett
GitHub
parent
bcf2694f93
commit
43bba20796
16 changed files with 186 additions and 735 deletions
|
|
@ -1,3 +1,9 @@
|
|||
/*
|
||||
* File: z_bg_haka_huta.c
|
||||
* Overlay: ovl_Bg_Haka_Huta
|
||||
* Description: Coffin Lid
|
||||
*/
|
||||
|
||||
#include "z_bg_haka_huta.h"
|
||||
|
||||
#define FLAGS 0x00000010
|
||||
|
|
@ -9,17 +15,17 @@ void BgHakaHuta_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
|||
void BgHakaHuta_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgHakaHuta_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
void func_8087D0AC(BgHakaHuta* this, GlobalContext* globalCtx);
|
||||
// void func_8087D268(BgHakaHuta* this, GlobalContext* globalCtx, u16 arg2); not sure about this one
|
||||
// void func_8087D5B8(BgHakaHuta* this, GlobalContext* globalCtx); not sure about this one
|
||||
void func_8087D66C(BgHakaHuta* this, GlobalContext* globalCtx);
|
||||
void BgHakaHuta_SpawnDust(BgHakaHuta* this, GlobalContext* globalCtx);
|
||||
void func_8087D268(BgHakaHuta* this, GlobalContext* globalCtx, u16 sfx);
|
||||
void BgHakaHuta_SpawnEnemies(BgHakaHuta* this, GlobalContext* globalCtx);
|
||||
void BgHakaHuta_Open(BgHakaHuta* this, GlobalContext* globalCtx);
|
||||
void BgHakaHuta_SlideOpen(BgHakaHuta* this, GlobalContext* globalCtx);
|
||||
void func_8087D720(BgHakaHuta* this, GlobalContext* globalCtx);
|
||||
void func_8087D8C0(BgHakaHuta* this, GlobalContext* globalCtx);
|
||||
|
||||
extern UNK_TYPE D_060006B0;
|
||||
extern UNK_TYPE D_06000870;
|
||||
extern Gfx D_060006B0[];
|
||||
extern CollisionHeader D_06000870;
|
||||
|
||||
/*
|
||||
const ActorInit Bg_Haka_Huta_InitVars = {
|
||||
ACTOR_BG_HAKA_HUTA,
|
||||
ACTORCAT_BG,
|
||||
|
|
@ -31,25 +37,183 @@ const ActorInit Bg_Haka_Huta_InitVars = {
|
|||
(ActorFunc)BgHakaHuta_Update,
|
||||
(ActorFunc)BgHakaHuta_Draw,
|
||||
};
|
||||
*/
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Init.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Destroy.s")
|
||||
static InitChainEntry sInitChain[] = {
|
||||
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D0AC.s")
|
||||
void BgHakaHuta_Init(Actor* thisx, GlobalContext* globalCtx) {
|
||||
BgHakaHuta* this = THIS;
|
||||
s16 pad;
|
||||
CollisionHeader* colHeader;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D268.s")
|
||||
colHeader = NULL;
|
||||
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
|
||||
DynaPolyActor_Init(&this->dyna, 1);
|
||||
CollisionHeader_GetVirtual(&D_06000870, &colHeader);
|
||||
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
|
||||
this->unk_16A = (thisx->params >> 8) & 0xFF;
|
||||
this->dyna.actor.params &= 0xFF;
|
||||
if (Flags_GetSwitch(globalCtx, this->dyna.actor.params)) {
|
||||
this->counter = -1;
|
||||
this->actionFunc = func_8087D720;
|
||||
} else {
|
||||
this->actionFunc = BgHakaHuta_SpawnEnemies;
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D2F0.s")
|
||||
void BgHakaHuta_Destroy(Actor* thisx, GlobalContext* globalCtx) {
|
||||
BgHakaHuta* this = THIS;
|
||||
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D5B8.s")
|
||||
void BgHakaHuta_SpawnDust(BgHakaHuta* this, GlobalContext* globalCtx) {
|
||||
static Vec3f sEffectAccel[] = { 0.0f, 0.0f, 0.0f };
|
||||
static Color_RGBA8 primColor = { 30, 20, 50, 255 };
|
||||
static Color_RGBA8 envColor = { 0, 0, 0, 255 };
|
||||
f32 scale;
|
||||
f32 phi_f20;
|
||||
Vec3f effectPos;
|
||||
Vec3f effectVel;
|
||||
s32 i;
|
||||
f32 new_Xpos;
|
||||
f32 xPosOffset;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D66C.s")
|
||||
phi_f20 = (this->dyna.actor.world.rot.y == 0) ? 1.0f : -1.0f;
|
||||
effectVel.y = 0.0f;
|
||||
effectVel.z = 0.0f;
|
||||
effectVel.x = -0.5f * phi_f20;
|
||||
effectPos.y = this->dyna.actor.world.pos.y;
|
||||
effectPos.z = this->dyna.actor.world.pos.z;
|
||||
new_Xpos = 50 - ((this->dyna.actor.world.pos.x - this->dyna.actor.home.pos.x) * phi_f20);
|
||||
xPosOffset = new_Xpos * phi_f20;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D720.s")
|
||||
for (i = 0; i < 4; i++) {
|
||||
if (i == 2) {
|
||||
effectPos.z += 120.0f * phi_f20;
|
||||
}
|
||||
effectPos.x = this->dyna.actor.home.pos.x - (Rand_ZeroOne() * xPosOffset);
|
||||
scale = ((Rand_ZeroOne() * 10.0f) + 50.0f);
|
||||
func_8002829C(globalCtx, &effectPos, &effectVel, sEffectAccel, &primColor, &envColor, scale, 0xA);
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D8C0.s")
|
||||
void func_8087D268(BgHakaHuta* this, GlobalContext* globalCtx, u16 sfx) {
|
||||
Vec3f pos;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Update.s")
|
||||
pos.z = (this->dyna.actor.shape.rot.y == 0) ? this->dyna.actor.world.pos.z + 120.0f
|
||||
: this->dyna.actor.world.pos.z - 120.0f;
|
||||
pos.x = this->dyna.actor.world.pos.x;
|
||||
pos.y = this->dyna.actor.world.pos.y;
|
||||
Audio_PlaySoundAtPosition(globalCtx, &pos, 30, sfx);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Draw.s")
|
||||
void BgHakaHuta_SpawnEnemies(BgHakaHuta* this, GlobalContext* globalCtx) {
|
||||
if (Flags_GetSwitch(globalCtx, this->dyna.actor.params) && !Player_InCsMode(globalCtx)) {
|
||||
this->counter = 25;
|
||||
this->actionFunc = BgHakaHuta_Open;
|
||||
func_800800F8(globalCtx, 0x1771, 0x3E7, &this->dyna.actor, 0);
|
||||
if (this->unk_16A == 2) {
|
||||
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_FIREFLY,
|
||||
(this->dyna.actor.world.pos.x + (-25.0f) * Math_CosS(this->dyna.actor.shape.rot.y) +
|
||||
40.0f * Math_SinS(this->dyna.actor.shape.rot.y)),
|
||||
this->dyna.actor.world.pos.y - 10.0f,
|
||||
(this->dyna.actor.world.pos.z - (-25.0f) * Math_SinS(this->dyna.actor.shape.rot.y) +
|
||||
Math_CosS(this->dyna.actor.shape.rot.y) * 40.0f),
|
||||
0, this->dyna.actor.shape.rot.y + 0x8000, 0, 2);
|
||||
|
||||
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_FIREFLY,
|
||||
(this->dyna.actor.world.pos.x + (-25.0f) * (Math_CosS(this->dyna.actor.shape.rot.y)) +
|
||||
Math_SinS(this->dyna.actor.shape.rot.y) * 80.0f),
|
||||
this->dyna.actor.world.pos.y - 10.0f,
|
||||
(this->dyna.actor.world.pos.z - (-25.0f) * (Math_SinS(this->dyna.actor.shape.rot.y)) +
|
||||
Math_CosS(this->dyna.actor.shape.rot.y) * 80.0f),
|
||||
0, this->dyna.actor.shape.rot.y, 0, 2);
|
||||
|
||||
} else if (this->unk_16A == 1) {
|
||||
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_RD,
|
||||
(this->dyna.actor.home.pos.x + (-25.0f) * (Math_CosS(this->dyna.actor.shape.rot.y)) +
|
||||
Math_SinS(this->dyna.actor.shape.rot.y) * 100.0f),
|
||||
this->dyna.actor.home.pos.y - 40.0f,
|
||||
(this->dyna.actor.home.pos.z - (-25.0f) * (Math_SinS(this->dyna.actor.shape.rot.y)) +
|
||||
Math_CosS(this->dyna.actor.shape.rot.y) * 100.0f),
|
||||
0, this->dyna.actor.shape.rot.y, 0, 0xFD);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void BgHakaHuta_Open(BgHakaHuta* this, GlobalContext* globalCtx) {
|
||||
f32 posOffset;
|
||||
|
||||
if (this->counter != 0) {
|
||||
this->counter--;
|
||||
}
|
||||
posOffset = (this->dyna.actor.world.rot.y == 0) ? 4.0f : -4.0f;
|
||||
Math_StepToF(&this->dyna.actor.world.pos.x, this->dyna.actor.home.pos.x + posOffset, 2.0f);
|
||||
if (this->counter == 0) {
|
||||
this->counter = 37;
|
||||
func_8087D268(this, globalCtx, NA_SE_EV_COFFIN_CAP_OPEN);
|
||||
this->actionFunc = BgHakaHuta_SlideOpen;
|
||||
}
|
||||
}
|
||||
|
||||
void BgHakaHuta_SlideOpen(BgHakaHuta* this, GlobalContext* globalCtx) {
|
||||
f32 posOffset;
|
||||
|
||||
if (this->counter != 0) {
|
||||
this->counter--;
|
||||
}
|
||||
posOffset = (this->dyna.actor.world.rot.y == 0) ? 24.0f : -24.0f;
|
||||
if (!Math_StepToF(&this->dyna.actor.world.pos.x, this->dyna.actor.home.pos.x + posOffset, 0.5f)) {
|
||||
BgHakaHuta_SpawnDust(this, globalCtx);
|
||||
}
|
||||
if (this->counter == 0) {
|
||||
func_8087D268(this, globalCtx, NA_SE_EV_COFFIN_CAP_BOUND);
|
||||
this->actionFunc = func_8087D720;
|
||||
}
|
||||
}
|
||||
|
||||
void func_8087D720(BgHakaHuta* this, GlobalContext* globalCtx) {
|
||||
static Vec3f D_8087D958 = { 30.0f, 0.0f, 0.0f };
|
||||
static Vec3f D_8087D964 = { 0.032579999f, 0.325800001f, -0.944899976f };
|
||||
MtxF mtx;
|
||||
Vec3f vec;
|
||||
s32 quakeIndex;
|
||||
|
||||
this->counter++;
|
||||
if (this->counter == 6) {
|
||||
this->actionFunc = func_8087D8C0;
|
||||
quakeIndex = Quake_Add(ACTIVE_CAM, 3);
|
||||
Quake_SetSpeed(quakeIndex, 0x7530);
|
||||
Quake_SetQuakeValues(quakeIndex, 4, 0, 0, 0);
|
||||
Quake_SetCountdown(quakeIndex, 2);
|
||||
} else if (this->counter == 0) {
|
||||
this->counter = 6;
|
||||
this->actionFunc = func_8087D8C0;
|
||||
}
|
||||
|
||||
D_8087D958.x = this->counter + 24.0f;
|
||||
if (D_8087D958.x > 30.0f) {
|
||||
D_8087D958.x = 30.0f;
|
||||
}
|
||||
Matrix_RotateY(this->dyna.actor.world.rot.y * (M_PI / 0x8000), 0);
|
||||
func_800D23FC(this->counter * (191 * M_PI / 3750), &D_8087D964, 1);
|
||||
Matrix_MultVec3f(&D_8087D958, &vec);
|
||||
this->dyna.actor.world.pos.x = this->dyna.actor.home.pos.x + vec.x;
|
||||
this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y + vec.y;
|
||||
this->dyna.actor.world.pos.z = this->dyna.actor.home.pos.z + vec.z;
|
||||
Matrix_Get(&mtx);
|
||||
func_800D20CC(&mtx, &this->dyna.actor.shape.rot, 0);
|
||||
}
|
||||
|
||||
void func_8087D8C0(BgHakaHuta* this, GlobalContext* globalCtx) {
|
||||
}
|
||||
|
||||
void BgHakaHuta_Update(Actor* thisx, GlobalContext* globalCtx) {
|
||||
BgHakaHuta* this = THIS;
|
||||
this->actionFunc(this, globalCtx);
|
||||
}
|
||||
|
||||
void BgHakaHuta_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
||||
Gfx_DrawDListOpa(globalCtx, D_060006B0);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,8 @@ typedef void (*BgHakaHutaActionFunc)(struct BgHakaHuta*, GlobalContext*);
|
|||
typedef struct BgHakaHuta {
|
||||
/* 0x0000 */ DynaPolyActor dyna;
|
||||
/* 0x0164 */ BgHakaHutaActionFunc actionFunc;
|
||||
/* 0x0168 */ char unk_168[0x4];
|
||||
/* 0x0168 */ s16 counter;
|
||||
/* 0x016A */ s16 unk_16A;
|
||||
} BgHakaHuta; // size = 0x016C
|
||||
|
||||
extern const ActorInit Bg_Haka_Huta_InitVars;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue