mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-06 06:10:21 +00:00
Bg_Spot06_Objects OK and documented (#605)
* stuck on init * init matches * more functions matched * just a few functions left * three functions left * all finished * fix compiler error * various improvements * add actor description * remove unused asm * fix remaining dyna things * Update src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * fixed all of roman's comments * format c files Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
Zelllll
GitHub
parent
588de66d06
commit
84195fcef6
24 changed files with 465 additions and 1418 deletions
|
|
@ -1,23 +1,58 @@
|
|||
/*
|
||||
* File: z_bg_spot06_objects.c
|
||||
* Overlay: ovl_Bg_Spot06_Objects
|
||||
* Description: Lake Hylia Objects
|
||||
*/
|
||||
|
||||
#include "z_bg_spot06_objects.h"
|
||||
|
||||
#define FLAGS 0x00000200
|
||||
|
||||
#define THIS ((BgSpot06Objects*)thisx)
|
||||
|
||||
typedef enum {
|
||||
/* 0x0 */ LHO_WATER_TEMPLE_ENTRACE_GATE,
|
||||
/* 0x1 */ LHO_WATER_TEMPLE_ENTRANCE_LOCK,
|
||||
/* 0x2 */ LHO_WATER_PLANE,
|
||||
/* 0x3 */ LHO_ICE_BLOCK
|
||||
} LakeHyliaObjectsType;
|
||||
|
||||
typedef enum {
|
||||
/* 0x0 */ LHWB_GERUDO_VALLEY_RIVER_UPPER, // entrance from Gerudo Valley
|
||||
/* 0x1 */ LHWB_GERUDO_VALLEY_RIVER_LOWER, // river flowing from Gerudo Valley
|
||||
/* 0x2 */ LHWB_MAIN_1, // main water box
|
||||
/* 0x3 */ LHWB_MAIN_2 // extension of main water box
|
||||
} LakeHyliaWaterBoxIndices;
|
||||
|
||||
// Lake Hylia water plane levels
|
||||
#define WATER_LEVEL_RAISED (-1313)
|
||||
#define WATER_LEVEL_RIVER_RAISED (WATER_LEVEL_RAISED + 200)
|
||||
#define WATER_LEVEL_LOWERED (WATER_LEVEL_RAISED - 680)
|
||||
#define WATER_LEVEL_RIVER_LOWERED (WATER_LEVEL_RIVER_RAISED - 80)
|
||||
|
||||
void BgSpot06Objects_Init(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgSpot06Objects_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgSpot06Objects_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgSpot06Objects_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgSpot06Objects_GateWaitForSwitch(BgSpot06Objects* this, GlobalContext* globalCtx);
|
||||
void BgSpot06Objects_GateWaitToOpen(BgSpot06Objects* this, GlobalContext* globalCtx);
|
||||
void BgSpot06Objects_GateOpen(BgSpot06Objects* this, GlobalContext* globalCtx);
|
||||
void BgSpot06Objects_DoNothing(BgSpot06Objects* this, GlobalContext* globalCtx);
|
||||
void BgSpot06Objects_LockWait(BgSpot06Objects* this, GlobalContext* globalCtx);
|
||||
void BgSpot06Objects_LockPullOutward(BgSpot06Objects* this, GlobalContext* globalCtx);
|
||||
void BgSpot06Objects_LockSwimToSurface(BgSpot06Objects* this, GlobalContext* globalCtx);
|
||||
void BgSpot06Objects_LockFloat(BgSpot06Objects* this, GlobalContext* globalCtx);
|
||||
void BgSpot06Objects_WaterPlaneCutsceneWait(BgSpot06Objects* this, GlobalContext* globalCtx);
|
||||
void BgSpot06Objects_WaterPlaneCutsceneRise(BgSpot06Objects* this, GlobalContext* globalCtx);
|
||||
|
||||
extern UNK_TYPE D_06000120;
|
||||
extern UNK_TYPE D_06000470;
|
||||
extern UNK_TYPE D_06000E10;
|
||||
extern UNK_TYPE D_06000EE8;
|
||||
extern UNK_TYPE D_06001160;
|
||||
extern UNK_TYPE D_06001238;
|
||||
extern UNK_TYPE D_06002490;
|
||||
extern Gfx D_06000120[]; // Lake Hylia lowered water
|
||||
extern Gfx D_06000470[]; // Lake Hylia raised water
|
||||
extern Gfx D_06000E10[]; // Water Temple entrance gate
|
||||
extern CollisionHeader D_06000EE8; // Water Temple entrance gate collision
|
||||
extern Gfx D_06001160[]; // Zora's Domain entrance block of ice
|
||||
extern CollisionHeader D_06001238; // Zora's Domain entrance block of ice collision
|
||||
extern Gfx D_06002490[]; // Water Temple entrance lock
|
||||
|
||||
/*
|
||||
const ActorInit Bg_Spot06_Objects_InitVars = {
|
||||
ACTOR_BG_SPOT06_OBJECTS,
|
||||
ACTORCAT_PROP,
|
||||
|
|
@ -30,7 +65,7 @@ const ActorInit Bg_Spot06_Objects_InitVars = {
|
|||
(ActorFunc)BgSpot06Objects_Draw,
|
||||
};
|
||||
|
||||
static ColliderJntSphElementInit D_808AF930[1] = {
|
||||
static ColliderJntSphElementInit sJntSphItemsInit[1] = {
|
||||
{
|
||||
{
|
||||
ELEMTYPE_UNK0,
|
||||
|
|
@ -44,7 +79,7 @@ static ColliderJntSphElementInit D_808AF930[1] = {
|
|||
},
|
||||
};
|
||||
|
||||
static ColliderJntSphInit D_808AF954 = {
|
||||
static ColliderJntSphInit sJntSphInit = {
|
||||
{
|
||||
COLTYPE_NONE,
|
||||
AT_NONE,
|
||||
|
|
@ -54,41 +89,429 @@ static ColliderJntSphInit D_808AF954 = {
|
|||
COLSHAPE_JNTSPH,
|
||||
},
|
||||
1,
|
||||
D_808AF930,
|
||||
sJntSphItemsInit,
|
||||
};
|
||||
*/
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Init.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Destroy.s")
|
||||
static InitChainEntry sInitChain[] = {
|
||||
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEBC0.s")
|
||||
static InitChainEntry sInitChainWaterPlane[] = {
|
||||
ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP),
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AECB4.s")
|
||||
void BgSpot06Objects_Init(Actor* thisx, GlobalContext* globalCtx) {
|
||||
BgSpot06Objects* this = THIS;
|
||||
s32 pad;
|
||||
CollisionHeader* colHeader = NULL;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AED48.s")
|
||||
this->switchFlag = thisx->params & 0xFF;
|
||||
thisx->params = (thisx->params >> 8) & 0xFF;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AED7C.s")
|
||||
osSyncPrintf("spot06 obj nthisx->arg_data=[%d]", thisx->params);
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEE00.s")
|
||||
switch (thisx->params) {
|
||||
case LHO_WATER_TEMPLE_ENTRACE_GATE:
|
||||
Actor_ProcessInitChain(thisx, sInitChain);
|
||||
DynaPolyActor_Init(thisx, DPM_UNK);
|
||||
CollisionHeader_GetVirtual(&D_06000EE8, &colHeader);
|
||||
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, thisx, colHeader);
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEE0C.s")
|
||||
if (LINK_IS_ADULT && Flags_GetSwitch(globalCtx, this->switchFlag)) {
|
||||
thisx->world.pos.y = thisx->home.pos.y + 120.0f;
|
||||
this->actionFunc = BgSpot06Objects_DoNothing;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEE6C.s")
|
||||
} else {
|
||||
this->actionFunc = BgSpot06Objects_GateWaitForSwitch;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEEFC.s")
|
||||
break;
|
||||
case LHO_WATER_TEMPLE_ENTRANCE_LOCK:
|
||||
Actor_ProcessInitChain(thisx, sInitChain);
|
||||
Collider_InitJntSph(globalCtx, &this->collider);
|
||||
Collider_SetJntSph(globalCtx, &this->collider, thisx, &sJntSphInit, &this->colliderItem);
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF120.s")
|
||||
if (LINK_IS_ADULT && Flags_GetSwitch(globalCtx, this->switchFlag)) {
|
||||
if (!(gSaveContext.eventChkInf[6] & 0x200)) {
|
||||
thisx->home.pos.y = thisx->world.pos.y = WATER_LEVEL_LOWERED;
|
||||
} else {
|
||||
thisx->home.pos.y = thisx->world.pos.y = WATER_LEVEL_RAISED;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF1D8.s")
|
||||
this->actionFunc = BgSpot06Objects_LockFloat;
|
||||
thisx->world.pos.z -= 100.0f;
|
||||
thisx->home.pos.z = thisx->world.pos.z + 16.0f;
|
||||
this->collider.elements[0].dim.worldSphere.radius =
|
||||
this->collider.elements[0].dim.modelSphere.radius * 2;
|
||||
this->collider.elements[0].dim.worldSphere.center.z = thisx->world.pos.z + 16.0f;
|
||||
} else {
|
||||
this->actionFunc = BgSpot06Objects_LockWait;
|
||||
this->collider.elements[0].dim.worldSphere.radius = this->collider.elements[0].dim.modelSphere.radius;
|
||||
this->collider.elements[0].dim.worldSphere.center.z = thisx->world.pos.z;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF450.s")
|
||||
this->collider.elements[0].dim.worldSphere.center.x = thisx->world.pos.x;
|
||||
this->collider.elements[0].dim.worldSphere.center.y = thisx->world.pos.y;
|
||||
thisx->colChkInfo.mass = MASS_IMMOVABLE;
|
||||
break;
|
||||
case LHO_WATER_PLANE:
|
||||
Actor_ProcessInitChain(thisx, sInitChainWaterPlane);
|
||||
thisx->flags = 0x30;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Update.s")
|
||||
if (LINK_IS_ADULT && !(gSaveContext.eventChkInf[6] & 0x200)) {
|
||||
if (gSaveContext.sceneSetupIndex < 4) {
|
||||
this->lakeHyliaWaterLevel = -681.0f;
|
||||
globalCtx->colCtx.colHeader->waterBoxes[LHWB_GERUDO_VALLEY_RIVER_LOWER].ySurface =
|
||||
WATER_LEVEL_RIVER_LOWERED;
|
||||
globalCtx->colCtx.colHeader->waterBoxes[LHWB_GERUDO_VALLEY_RIVER_LOWER].zMin -= 50;
|
||||
globalCtx->colCtx.colHeader->waterBoxes[LHWB_MAIN_1].ySurface = WATER_LEVEL_LOWERED;
|
||||
globalCtx->colCtx.colHeader->waterBoxes[LHWB_MAIN_2].ySurface = WATER_LEVEL_LOWERED;
|
||||
this->actionFunc = BgSpot06Objects_DoNothing;
|
||||
} else {
|
||||
thisx->world.pos.y = this->lakeHyliaWaterLevel = -681.0f;
|
||||
thisx->world.pos.y += WATER_LEVEL_RAISED;
|
||||
this->actionFunc = BgSpot06Objects_WaterPlaneCutsceneWait;
|
||||
}
|
||||
} else {
|
||||
this->lakeHyliaWaterLevel = 0.0f;
|
||||
this->actionFunc = BgSpot06Objects_DoNothing;
|
||||
}
|
||||
break;
|
||||
case LHO_ICE_BLOCK:
|
||||
Actor_ProcessInitChain(thisx, sInitChain);
|
||||
DynaPolyActor_Init(thisx, DPM_UNK);
|
||||
CollisionHeader_GetVirtual(&D_06001238, &colHeader);
|
||||
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, thisx, colHeader);
|
||||
this->actionFunc = BgSpot06Objects_DoNothing;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF524.s")
|
||||
if (LINK_IS_CHILD) {
|
||||
Actor_Kill(thisx);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Draw.s")
|
||||
void BgSpot06Objects_Destroy(Actor* thisx, GlobalContext* globalCtx) {
|
||||
BgSpot06Objects* this = THIS;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF7FC.s")
|
||||
switch (this->dyna.actor.params) {
|
||||
case LHO_WATER_TEMPLE_ENTRACE_GATE:
|
||||
case LHO_ICE_BLOCK:
|
||||
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
|
||||
break;
|
||||
case LHO_WATER_TEMPLE_ENTRANCE_LOCK:
|
||||
Collider_DestroyJntSph(globalCtx, &this->collider.base);
|
||||
break;
|
||||
case LHO_WATER_PLANE:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF824.s")
|
||||
/**
|
||||
* Water Temple entrance gate effect functions
|
||||
*/
|
||||
void BgSpot06Objects_GateSpawnBubbles(BgSpot06Objects* this, GlobalContext* globalCtx) {
|
||||
Vec3f sp34;
|
||||
f32 tmp;
|
||||
|
||||
if ((globalCtx->gameplayFrames % 3) == 0) {
|
||||
tmp = Rand_CenteredFloat(160.0f);
|
||||
sp34.x = (Math_SinS(this->dyna.actor.shape.rot.y + 0x4000) * tmp) + this->dyna.actor.world.pos.x;
|
||||
sp34.y = this->dyna.actor.world.pos.y;
|
||||
sp34.z = (Math_CosS(this->dyna.actor.shape.rot.y + 0x4000) * tmp) + this->dyna.actor.world.pos.z;
|
||||
EffectSsBubble_Spawn(globalCtx, &sp34.x, 50.0f, 70.0f, 10.0f, (Rand_ZeroOne() * 0.05f) + 0.175f);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* This is where the gate waits for the switch to be set by the fish shaped lock.
|
||||
*/
|
||||
void BgSpot06Objects_GateWaitForSwitch(BgSpot06Objects* this, GlobalContext* globalCtx) {
|
||||
s32 i;
|
||||
|
||||
if (Flags_GetSwitch(globalCtx, this->switchFlag)) {
|
||||
this->timer = 100;
|
||||
this->dyna.actor.world.pos.y += 3.0f;
|
||||
this->actionFunc = BgSpot06Objects_GateWaitToOpen;
|
||||
|
||||
for (i = 0; i < 15; i++) {
|
||||
BgSpot06Objects_GateSpawnBubbles(this, globalCtx);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* This is where the gate waits a few frames before rising after the switch is set.
|
||||
*/
|
||||
void BgSpot06Objects_GateWaitToOpen(BgSpot06Objects* this, GlobalContext* globalCtx) {
|
||||
if (this->timer != 0) {
|
||||
this->timer--;
|
||||
}
|
||||
|
||||
if (this->timer == 0) {
|
||||
this->actionFunc = BgSpot06Objects_GateOpen;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* This is where the gate finally rises upward.
|
||||
*/
|
||||
void BgSpot06Objects_GateOpen(BgSpot06Objects* this, GlobalContext* globalCtx) {
|
||||
BgSpot06Objects_GateSpawnBubbles(this, globalCtx);
|
||||
|
||||
if (Math_StepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y + 120.0f, 0.6f)) {
|
||||
this->actionFunc = BgSpot06Objects_DoNothing;
|
||||
this->timer = 0;
|
||||
Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_METALDOOR_STOP);
|
||||
} else {
|
||||
func_8002F974(&this->dyna.actor, NA_SE_EV_METALDOOR_SLIDE - SFX_FLAG);
|
||||
}
|
||||
}
|
||||
|
||||
void BgSpot06Objects_DoNothing(BgSpot06Objects* this, GlobalContext* globalCtx) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Fish shaped lock effect functions
|
||||
*/
|
||||
void BgSpot06Objects_LockSpawnWaterRipples(BgSpot06Objects* this, GlobalContext* globalCtx, s32 flag) {
|
||||
if (flag || !(globalCtx->gameplayFrames % 7)) {
|
||||
EffectSsGRipple_Spawn(globalCtx, &this->dyna.actor.home, 300, 700, 0);
|
||||
}
|
||||
}
|
||||
|
||||
void BgSpot06Objects_LockSpawnBubbles(BgSpot06Objects* this, GlobalContext* globalCtx, s32 flag) {
|
||||
if (!(globalCtx->gameplayFrames % 7) || flag) {
|
||||
EffectSsBubble_Spawn(globalCtx, &this->dyna.actor.world, 0.0f, 40.0f, 30.0f, (Rand_ZeroOne() * 0.05f) + 0.175f);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* This is where the fish shaped lock waits to be pulled out by the hookshot. Once it does it will spawn bubbles.
|
||||
*/
|
||||
void BgSpot06Objects_LockWait(BgSpot06Objects* this, GlobalContext* globalCtx) {
|
||||
s32 pad;
|
||||
s32 i;
|
||||
s32 pad2;
|
||||
Vec3f effectPos;
|
||||
f32 sin;
|
||||
f32 cos;
|
||||
|
||||
if (this->collider.base.acFlags & 2) {
|
||||
this->timer = 130;
|
||||
this->dyna.actor.flags |= 0x10;
|
||||
sin = Math_SinS(this->dyna.actor.world.rot.y);
|
||||
cos = Math_CosS(this->dyna.actor.world.rot.y);
|
||||
this->dyna.actor.world.pos.x += (3.0f * sin);
|
||||
this->dyna.actor.world.pos.z += (3.0f * cos);
|
||||
|
||||
for (i = 0; i < 20; i++) {
|
||||
BgSpot06Objects_LockSpawnBubbles(this, globalCtx, 1);
|
||||
}
|
||||
|
||||
effectPos.x = this->dyna.actor.world.pos.x + (5.0f * sin);
|
||||
effectPos.y = this->dyna.actor.world.pos.y;
|
||||
effectPos.z = this->dyna.actor.world.pos.z + (5.0f * cos);
|
||||
|
||||
for (i = 0; i < 3; i++) {
|
||||
EffectSsBubble_Spawn(globalCtx, &effectPos, 0.0f, 20.0f, 20.0f, (Rand_ZeroOne() * 0.1f) + 0.7f);
|
||||
}
|
||||
|
||||
EffectSsGSplash_Spawn(globalCtx, &this->dyna.actor.world, NULL, NULL, 1, 700);
|
||||
this->collider.elements->dim.worldSphere.radius = 45;
|
||||
this->actionFunc = BgSpot06Objects_LockPullOutward;
|
||||
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
|
||||
Flags_SetSwitch(globalCtx, this->switchFlag);
|
||||
func_800800F8(globalCtx, 0x1018, 170, &this->dyna.actor, 0);
|
||||
} else {
|
||||
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Once the fish shaped lock is pulled out from the Hookshot it will move outward.
|
||||
*/
|
||||
void BgSpot06Objects_LockPullOutward(BgSpot06Objects* this, GlobalContext* globalCtx) {
|
||||
if (this->timer != 0) {
|
||||
this->timer--;
|
||||
}
|
||||
|
||||
this->dyna.actor.world.pos.x += (0.3f * Math_SinS(this->dyna.actor.world.rot.y));
|
||||
this->dyna.actor.world.pos.z += (0.3f * Math_CosS(this->dyna.actor.world.rot.y));
|
||||
BgSpot06Objects_LockSpawnBubbles(this, globalCtx, 0);
|
||||
|
||||
if (this->timer == 0) {
|
||||
this->dyna.actor.velocity.y = 0.5f;
|
||||
this->dyna.actor.flags &= ~0x2000;
|
||||
|
||||
this->actionFunc = BgSpot06Objects_LockSwimToSurface;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* After being pulled all the way out the fish shaped lock will rise to the surface, creating bubbles in the water as it
|
||||
* does so.
|
||||
*/
|
||||
void BgSpot06Objects_LockSwimToSurface(BgSpot06Objects* this, GlobalContext* globalCtx) {
|
||||
f32 cos;
|
||||
f32 pad;
|
||||
|
||||
this->dyna.actor.world.pos.y += this->dyna.actor.velocity.y;
|
||||
|
||||
if (this->dyna.actor.velocity.y <= 0.0f) {
|
||||
cos = Math_CosS(this->dyna.actor.shape.rot.x) * 4.3f;
|
||||
this->dyna.actor.world.pos.x += (cos * Math_SinS(this->dyna.actor.shape.rot.y));
|
||||
this->dyna.actor.world.pos.z += (cos * Math_CosS(this->dyna.actor.shape.rot.y));
|
||||
this->dyna.actor.world.pos.y = this->dyna.actor.world.pos.y - 1.3f;
|
||||
BgSpot06Objects_LockSpawnWaterRipples(this, globalCtx, 0);
|
||||
|
||||
if (Math_ScaledStepToS(&this->dyna.actor.shape, 0, 0x260) != 0) {
|
||||
this->dyna.actor.home.pos.x =
|
||||
this->dyna.actor.world.pos.x - (Math_SinS(this->dyna.actor.shape.rot.y) * 16.0f);
|
||||
this->dyna.actor.home.pos.z =
|
||||
this->dyna.actor.world.pos.z - (Math_CosS(this->dyna.actor.shape.rot.y) * 16.0f);
|
||||
this->dyna.actor.world.pos.y = -1993.0f;
|
||||
this->timer = 32;
|
||||
this->dyna.actor.flags &= ~0x10;
|
||||
this->collider.elements[0].dim.worldSphere.radius = this->collider.elements[0].dim.modelSphere.radius * 2;
|
||||
this->actionFunc = BgSpot06Objects_LockFloat;
|
||||
}
|
||||
} else {
|
||||
if (this->dyna.actor.world.pos.y >= -1973.0f) {
|
||||
this->dyna.actor.velocity.y = 0.0f;
|
||||
BgSpot06Objects_LockSpawnWaterRipples(this, globalCtx, 1);
|
||||
EffectSsGSplash_Spawn(globalCtx, &this->dyna.actor.home, NULL, NULL, 1, 700);
|
||||
} else if (this->dyna.actor.shape.rot.x == -0x4000) {
|
||||
this->dyna.actor.velocity.y += 0.02f;
|
||||
this->dyna.actor.world.pos.x = Rand_CenteredFloat(1.0f) + this->dyna.actor.home.pos.x;
|
||||
this->dyna.actor.world.pos.z = Rand_CenteredFloat(1.0f) + this->dyna.actor.home.pos.z;
|
||||
this->dyna.actor.velocity.y =
|
||||
(this->dyna.actor.velocity.y > 10.0f) ? (10.0f) : (this->dyna.actor.velocity.y);
|
||||
BgSpot06Objects_LockSpawnBubbles(this, globalCtx, 0);
|
||||
} else {
|
||||
BgSpot06Objects_LockSpawnBubbles(this, globalCtx, 0);
|
||||
|
||||
if (Math_ScaledStepToS(&this->dyna.actor.shape.rot.x, -0x4000, 0x30)) {
|
||||
this->dyna.actor.home.pos.x = this->dyna.actor.world.pos.x;
|
||||
this->dyna.actor.home.pos.y = -1993.0f;
|
||||
this->dyna.actor.home.pos.z = this->dyna.actor.world.pos.z;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Once the fish shaped lock finishes rising to the surface it will float and create ripples in the water every few
|
||||
* frames.
|
||||
*/
|
||||
void BgSpot06Objects_LockFloat(BgSpot06Objects* this, GlobalContext* globalCtx) {
|
||||
BgSpot06Objects_LockSpawnWaterRipples(this, globalCtx, 0);
|
||||
|
||||
if (this->timer != 0) {
|
||||
this->timer--;
|
||||
}
|
||||
|
||||
this->dyna.actor.world.pos.y = (2.0f * sinf(this->timer * (M_PI / 16.0f))) + this->dyna.actor.home.pos.y;
|
||||
|
||||
if (this->timer == 0) {
|
||||
this->timer = 32;
|
||||
}
|
||||
}
|
||||
|
||||
void BgSpot06Objects_Update(Actor* thisx, GlobalContext* globalCtx) {
|
||||
BgSpot06Objects* this = THIS;
|
||||
|
||||
this->actionFunc(this, globalCtx);
|
||||
|
||||
if (thisx->params == LHO_WATER_TEMPLE_ENTRANCE_LOCK) {
|
||||
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Draw the Lake Hylia water plane, and scroll its texture
|
||||
*/
|
||||
void BgSpot06Objects_DrawLakeHyliaWater(BgSpot06Objects* this, GlobalContext* globalCtx) {
|
||||
s32 pad;
|
||||
s32 gameplayFrames;
|
||||
|
||||
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot06_objects.c", 844);
|
||||
|
||||
func_80093D84(globalCtx->state.gfxCtx);
|
||||
|
||||
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot06_objects.c", 850),
|
||||
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
|
||||
gameplayFrames = globalCtx->state.frames;
|
||||
|
||||
gSPSegment(POLY_XLU_DISP++, 0x08,
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, -gameplayFrames, gameplayFrames, 32, 32, 1, gameplayFrames,
|
||||
gameplayFrames, 32, 32));
|
||||
gSPSegment(POLY_XLU_DISP++, 0x09,
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, -gameplayFrames, gameplayFrames * 6, 32, 32, 1,
|
||||
gameplayFrames, gameplayFrames * 6, 32, 32));
|
||||
|
||||
gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, 128);
|
||||
|
||||
if ((this->lakeHyliaWaterLevel < -680.0f) && (gSaveContext.sceneSetupIndex < 4)) {
|
||||
gSPDisplayList(POLY_XLU_DISP++, D_06000120);
|
||||
} else {
|
||||
gSPDisplayList(POLY_XLU_DISP++, D_06000470);
|
||||
}
|
||||
|
||||
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot06_objects.c", 879);
|
||||
}
|
||||
|
||||
void BgSpot06Objects_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
||||
BgSpot06Objects* this = THIS;
|
||||
|
||||
switch (this->dyna.actor.params) {
|
||||
case LHO_WATER_TEMPLE_ENTRACE_GATE:
|
||||
Gfx_DrawDListOpa(globalCtx, D_06000E10);
|
||||
break;
|
||||
case LHO_WATER_TEMPLE_ENTRANCE_LOCK:
|
||||
Gfx_DrawDListOpa(globalCtx, D_06002490);
|
||||
|
||||
if (this->actionFunc == BgSpot06Objects_LockSwimToSurface) {
|
||||
Collider_UpdateSpheres(1, &this->collider);
|
||||
}
|
||||
break;
|
||||
case LHO_WATER_PLANE:
|
||||
BgSpot06Objects_DrawLakeHyliaWater(this, globalCtx);
|
||||
break;
|
||||
case LHO_ICE_BLOCK:
|
||||
Gfx_DrawDListOpa(globalCtx, D_06001160);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* This is where the Lake Hylia water plane waits for the cutscene to set the water risen flag after the Water Temple is
|
||||
* cleared.
|
||||
*/
|
||||
void BgSpot06Objects_WaterPlaneCutsceneWait(BgSpot06Objects* this, GlobalContext* globalCtx) {
|
||||
if (gSaveContext.eventChkInf[6] & 0x200) {
|
||||
this->actionFunc = BgSpot06Objects_WaterPlaneCutsceneRise;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* This is where the Lake Hylia water plane rises in the cutscene after the Water Temple is cleared.
|
||||
*/
|
||||
void BgSpot06Objects_WaterPlaneCutsceneRise(BgSpot06Objects* this, GlobalContext* globalCtx) {
|
||||
s32 pad;
|
||||
|
||||
this->dyna.actor.world.pos.y = this->lakeHyliaWaterLevel + WATER_LEVEL_RAISED;
|
||||
|
||||
if (this->lakeHyliaWaterLevel >= 0.0001f) {
|
||||
this->dyna.actor.world.pos.y = WATER_LEVEL_RAISED;
|
||||
this->actionFunc = BgSpot06Objects_DoNothing;
|
||||
} else {
|
||||
Math_SmoothStepToF(&this->lakeHyliaWaterLevel, 1.0f, 0.1f, 1.0f, 0.001f);
|
||||
globalCtx->colCtx.colHeader->waterBoxes[LHWB_GERUDO_VALLEY_RIVER_LOWER].ySurface = WATER_LEVEL_RIVER_LOWERED;
|
||||
globalCtx->colCtx.colHeader->waterBoxes[LHWB_MAIN_1].ySurface = this->dyna.actor.world.pos.y;
|
||||
globalCtx->colCtx.colHeader->waterBoxes[LHWB_MAIN_2].ySurface = this->dyna.actor.world.pos.y;
|
||||
}
|
||||
|
||||
func_8002F948(&this->dyna.actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,9 +6,16 @@
|
|||
|
||||
struct BgSpot06Objects;
|
||||
|
||||
typedef void (*BgSpot06ObjectsActionFunc)(struct BgSpot06Objects*, GlobalContext*);
|
||||
|
||||
typedef struct BgSpot06Objects {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ char unk_14C[0x84];
|
||||
/* 0x0000 */ DynaPolyActor dyna;
|
||||
/* 0x0164 */ BgSpot06ObjectsActionFunc actionFunc;
|
||||
/* 0x0168 */ s16 switchFlag;
|
||||
/* 0x016A */ s16 timer;
|
||||
/* 0x016C */ f32 lakeHyliaWaterLevel;
|
||||
/* 0x0170 */ ColliderJntSph collider;
|
||||
/* 0x0190 */ ColliderJntSphElement colliderItem[1];
|
||||
} BgSpot06Objects; // size = 0x01D0
|
||||
|
||||
extern const ActorInit Bg_Spot06_Objects_InitVars;
|
||||
|
|
|
|||
|
|
@ -48,12 +48,8 @@ static ColliderCylinderInit D_80AA0420 = {
|
|||
static u32 D_80AA044C[] = { 0x01000000, 0x00400000, 0x00800000 };
|
||||
static u32 D_80AA0458[] = { 0x08000000, 0x02000000, 0x04000000 };
|
||||
|
||||
static u16 sSfxIds[] = {
|
||||
NA_SE_IT_ROLLING_CUT_LV2,
|
||||
NA_SE_IT_ROLLING_CUT_LV1,
|
||||
NA_SE_IT_ROLLING_CUT_LV2,
|
||||
NA_SE_IT_ROLLING_CUT_LV1
|
||||
};
|
||||
static u16 sSfxIds[] = { NA_SE_IT_ROLLING_CUT_LV2, NA_SE_IT_ROLLING_CUT_LV1, NA_SE_IT_ROLLING_CUT_LV2,
|
||||
NA_SE_IT_ROLLING_CUT_LV1 };
|
||||
|
||||
extern Gfx D_04012570[];
|
||||
extern Gfx D_04012690[];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue