mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-10 19:20:13 +00:00
Code Issues Projects Releases Wiki Activity

[Doc] Actor Bg_Bdan_Objects (Jabu Jabu misc dungeon actors) (#1577)

Browse source 
* bdan_objects type 2

* other bdan object types

* finish off bigocto platform

* run formatter

* remove stray comment

* add namespacing prefix to enums

* abbreviate camera to cam

* Update src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* fix typo on enum

* Update src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* enum name fixes

* remove unnecessary enum assignment

* Waterbox -> WaterBox

* named union, sfx to use SFX_FLAG

* friendly names for enums

* fix over-eager sed rename

* indent union fields

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
This commit is contained in:
krm01 2023-12-11 07:55:35 -08:00 committed by GitHub
parent b2f596faca
commit e3316c9fb1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 123 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

204
src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c
View file

@ -10,27 +10,38 @@
#define FLAGS ACTOR_FLAG_4 #define FLAGS ACTOR_FLAG_4
typedef enum {
JABU_OBJECTS_GET_PROP_CAM_SETTING_NORMAL0 = 0,
JABU_OBJECTS_GET_PROP_CAM_SETTING_DUNGEON1 = 3,
JABU_OBJECTS_GET_PROP_WATCHED_BIGOCTO_INTRO_CUTSCENE = 4
} BgBdanObjectsPropertyGetter;
typedef enum {
JABU_OBJECTS_SET_PROP_CAM_SETTING_NORMAL1 = 1,
JABU_OBJECTS_SET_PROP_CAM_SETTING_DUNGEON0 = 2,
JABU_OBJECTS_SET_PROP_WATCHED_BIGOCTO_INTRO_CUTSCENE = 4
} BgBdanObjectsPropertySetter;
void BgBdanObjects_Init(Actor* thisx, PlayState* play); void BgBdanObjects_Init(Actor* thisx, PlayState* play);
void BgBdanObjects_Destroy(Actor* thisx, PlayState* play); void BgBdanObjects_Destroy(Actor* thisx, PlayState* play);
void BgBdanObjects_Update(Actor* thisx, PlayState* play); void BgBdanObjects_Update(Actor* thisx, PlayState* play);
void BgBdanObjects_Draw(Actor* thisx, PlayState* play); void BgBdanObjects_Draw(Actor* thisx, PlayState* play);
void func_8086C054(BgBdanObjects* this, PlayState* play); void BgBdanObjects_OctoPlatform_WaitForRutoToStartCutscene(BgBdanObjects* this, PlayState* play);
void func_8086C1A0(BgBdanObjects* this, PlayState* play); void BgBdanObjects_OctoPlatform_RaiseToUpperPosition(BgBdanObjects* this, PlayState* play);
void func_8086C29C(BgBdanObjects* this, PlayState* play); void BgBdanObjects_OctoPlatform_WaitForRutoToAdvanceCutscene(BgBdanObjects* this, PlayState* play);
void func_8086C55C(BgBdanObjects* this, PlayState* play); void BgBdanObjects_OctoPlatform_PauseBeforeDescending(BgBdanObjects* this, PlayState* play);
void func_8086C5BC(BgBdanObjects* this, PlayState* play); void BgBdanObjects_OctoPlatform_WaitForBigOctoToStartBattle(BgBdanObjects* this, PlayState* play);
void func_8086C618(BgBdanObjects* this, PlayState* play); void BgBdanObjects_OctoPlatform_BattleInProgress(BgBdanObjects* this, PlayState* play);
void func_8086C6EC(BgBdanObjects* this, PlayState* play); void BgBdanObjects_SinkToFloorHeight(BgBdanObjects* this, PlayState* play);
void func_8086C76C(BgBdanObjects* this, PlayState* play); void BgBdanObjects_WaitForPlayerInRange(BgBdanObjects* this, PlayState* play);
void func_8086C7D0(BgBdanObjects* this, PlayState* play); void BgBdanObjects_RaiseToUpperPosition(BgBdanObjects* this, PlayState* play);
void BgBdanObjects_DoNothing(BgBdanObjects* this, PlayState* play); void BgBdanObjects_DoNothing(BgBdanObjects* this, PlayState* play);
void func_8086C874(BgBdanObjects* this, PlayState* play); void BgBdanObjects_ElevatorOscillate(BgBdanObjects* this, PlayState* play);
void func_8086C9A8(BgBdanObjects* this, PlayState* play); void BgBdanObjects_WaitForSwitch(BgBdanObjects* this, PlayState* play);
void func_8086C9F0(BgBdanObjects* this, PlayState* play); void BgBdanObjects_ChangeWaterBoxLevel(BgBdanObjects* this, PlayState* play);
void func_8086CABC(BgBdanObjects* this, PlayState* play); void BgBdanObjects_WaitForTimerExpired(BgBdanObjects* this, PlayState* play);
void func_8086CB10(BgBdanObjects* this, PlayState* play); void BgBdanObjects_WaitForPlayerOnTop(BgBdanObjects* this, PlayState* play);
void func_8086CB8C(BgBdanObjects* this, PlayState* play); void BgBdanObjects_FallToLowerPos(BgBdanObjects* this, PlayState* play);
ActorInit Bg_Bdan_Objects_InitVars = { ActorInit Bg_Bdan_Objects_InitVars = {
/**/ ACTOR_BG_BDAN_OBJECTS, /**/ ACTOR_BG_BDAN_OBJECTS,
@ -75,13 +86,13 @@ static Gfx* sDLists[] = {
gJabuFallingPlatformDL, gJabuFallingPlatformDL,
}; };
s32 BgBdanObjects_GetContactRu1(BgBdanObjects* this, s32 arg1) { s32 BgBdanObjects_GetProperty(BgBdanObjects* this, s32 arg1) {
switch (arg1) { switch (arg1) {
case 0: case JABU_OBJECTS_GET_PROP_CAM_SETTING_NORMAL0:
return this->cameraSetting == CAM_SET_NORMAL0; return this->cameraSetting == CAM_SET_NORMAL0;
case 4: case JABU_OBJECTS_GET_PROP_WATCHED_BIGOCTO_INTRO_CUTSCENE:
return GET_INFTABLE(INFTABLE_146); return GET_INFTABLE(INFTABLE_146);
case 3: case JABU_OBJECTS_GET_PROP_CAM_SETTING_DUNGEON1:
return this->cameraSetting == CAM_SET_DUNGEON1; return this->cameraSetting == CAM_SET_DUNGEON1;
default: default:
osSyncPrintf("Bg_Bdan_Objects_Get_Contact_Ru1\nそんな受信モードは無い%d!!!!!!!!\n"); osSyncPrintf("Bg_Bdan_Objects_Get_Contact_Ru1\nそんな受信モードは無い%d!!!!!!!!\n");
@ -89,15 +100,15 @@ s32 BgBdanObjects_GetContactRu1(BgBdanObjects* this, s32 arg1) {
} }
} }
void BgBdanObjects_SetContactRu1(BgBdanObjects* this, s32 arg1) { void BgBdanObjects_SetProperty(BgBdanObjects* this, s32 arg1) {
switch (arg1) { switch (arg1) {
case 1: case JABU_OBJECTS_SET_PROP_CAM_SETTING_NORMAL1:
this->cameraSetting = CAM_SET_NORMAL1; this->cameraSetting = CAM_SET_NORMAL1;
break; break;
case 2: case JABU_OBJECTS_SET_PROP_CAM_SETTING_DUNGEON0:
this->cameraSetting = CAM_SET_DUNGEON0; this->cameraSetting = CAM_SET_DUNGEON0;
break; break;
case 4: case JABU_OBJECTS_SET_PROP_WATCHED_BIGOCTO_INTRO_CUTSCENE:
SET_INFTABLE(INFTABLE_146); SET_INFTABLE(INFTABLE_146);
break; break;
default: default:
@ -112,51 +123,51 @@ void BgBdanObjects_Init(Actor* thisx, PlayState* play) {
Actor_ProcessInitChain(&this->dyna.actor, sInitChain); Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, DYNA_TRANSFORM_POS); DynaPolyActor_Init(&this->dyna, DYNA_TRANSFORM_POS);
this->switchFlag = (thisx->params >> 8) & 0x3F; this->var.switchFlag = (thisx->params >> 8) & 0x3F;
thisx->params &= 0xFF; thisx->params &= 0xFF;
if (thisx->params == 2) { if (thisx->params == JABU_OBJECTS_TYPE_WATERBOX_HEIGHT_CHANGER) {
thisx->flags |= ACTOR_FLAG_4 | ACTOR_FLAG_5; thisx->flags |= ACTOR_FLAG_4 | ACTOR_FLAG_5;
play->colCtx.colHeader->waterBoxes[7].ySurface = thisx->world.pos.y; play->colCtx.colHeader->waterBoxes[7].ySurface = thisx->world.pos.y;
this->actionFunc = func_8086C9A8; this->actionFunc = BgBdanObjects_WaitForSwitch;
return; return;
} }
if (thisx->params == 0) { if (thisx->params == JABU_OBJECTS_TYPE_BIG_OCTO_PLATFORM) {
CollisionHeader_GetVirtual(&gJabuBigOctoPlatformCol, &colHeader); CollisionHeader_GetVirtual(&gJabuBigOctoPlatformCol, &colHeader);
Collider_InitCylinder(play, &this->collider); Collider_InitCylinder(play, &this->collider);
Collider_SetCylinder(play, &this->collider, &this->dyna.actor, &sCylinderInit); Collider_SetCylinder(play, &this->collider, &this->dyna.actor, &sCylinderInit);
thisx->world.pos.y += -79.0f; thisx->world.pos.y += -79.0f;
if (Flags_GetClear(play, thisx->room)) { if (Flags_GetClear(play, thisx->room)) {
Flags_SetSwitch(play, this->switchFlag); Flags_SetSwitch(play, this->var.switchFlag);
this->actionFunc = func_8086C6EC; this->actionFunc = BgBdanObjects_SinkToFloorHeight;
} else { } else {
if (BgBdanObjects_GetContactRu1(this, 4)) { if (BgBdanObjects_GetProperty(this, JABU_OBJECTS_GET_PROP_WATCHED_BIGOCTO_INTRO_CUTSCENE)) {
if (Actor_SpawnAsChild(&play->actorCtx, &this->dyna.actor, play, ACTOR_EN_BIGOKUTA, thisx->home.pos.x, if (Actor_SpawnAsChild(&play->actorCtx, &this->dyna.actor, play, ACTOR_EN_BIGOKUTA, thisx->home.pos.x,
thisx->home.pos.y, thisx->home.pos.z, 0, thisx->shape.rot.y + 0x8000, 0, thisx->home.pos.y, thisx->home.pos.z, 0, thisx->shape.rot.y + 0x8000, 0,
3) != NULL) { 3) != NULL) {
thisx->child->world.pos.z = thisx->child->home.pos.z + 263.0f; thisx->child->world.pos.z = thisx->child->home.pos.z + 263.0f;
} }
thisx->world.rot.y = 0; thisx->world.rot.y = 0;
this->actionFunc = func_8086C618; this->actionFunc = BgBdanObjects_OctoPlatform_BattleInProgress;
thisx->world.pos.y = thisx->home.pos.y + -70.0f; thisx->world.pos.y = thisx->home.pos.y + -70.0f;
} else { } else {
Flags_SetSwitch(play, this->switchFlag); Flags_SetSwitch(play, this->var.switchFlag);
this->timer = 0; this->timer = 0;
this->actionFunc = func_8086C054; this->actionFunc = BgBdanObjects_OctoPlatform_WaitForRutoToStartCutscene;
} }
} }
} else { } else {
if (thisx->params == 1) { if (thisx->params == JABU_OBJECTS_TYPE_SMALL_AUTO_ELEVATOR) {
CollisionHeader_GetVirtual(&gJabuElevatorCol, &colHeader); CollisionHeader_GetVirtual(&gJabuElevatorCol, &colHeader);
this->timer = 512; this->timer = 512;
this->switchFlag = 0; this->var.camChangeTimer = 0;
this->actionFunc = func_8086C874; this->actionFunc = BgBdanObjects_ElevatorOscillate;
} else { } else { // JABU_OBJECTS_TYPE_FALLING_PLATFORM
CollisionHeader_GetVirtual(&gJabuLoweringPlatformCol, &colHeader); CollisionHeader_GetVirtual(&gJabuLoweringPlatformCol, &colHeader);
if (Flags_GetSwitch(play, this->switchFlag)) { if (Flags_GetSwitch(play, this->var.switchFlag)) {
this->actionFunc = BgBdanObjects_DoNothing; this->actionFunc = BgBdanObjects_DoNothing;
thisx->world.pos.y = thisx->home.pos.y - 400.0f; thisx->world.pos.y = thisx->home.pos.y - 400.0f;
} else { } else {
this->actionFunc = func_8086CB10; this->actionFunc = BgBdanObjects_WaitForPlayerOnTop;
} }
} }
} }
@ -167,17 +178,21 @@ void BgBdanObjects_Destroy(Actor* thisx, PlayState* play) {
BgBdanObjects* this = (BgBdanObjects*)thisx; BgBdanObjects* this = (BgBdanObjects*)thisx;
DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId);
if (thisx->params == 0) { if (thisx->params == JABU_OBJECTS_TYPE_BIG_OCTO_PLATFORM) {
Collider_DestroyCylinder(play, &this->collider); Collider_DestroyCylinder(play, &this->collider);
} }
} }
void func_8086C054(BgBdanObjects* this, PlayState* play) { /**
* This actor will never escape this actionFunc on its own. It relies on
* En_Ru1 (Ruto) to change its cameraSetting to NORMAL0, which allows the
* state machine to proceed.
*/
void BgBdanObjects_OctoPlatform_WaitForRutoToStartCutscene(BgBdanObjects* this, PlayState* play) {
Player* player = GET_PLAYER(play); Player* player = GET_PLAYER(play);
if (BgBdanObjects_GetProperty(this, JABU_OBJECTS_GET_PROP_CAM_SETTING_NORMAL0)) {
if (BgBdanObjects_GetContactRu1(this, 0)) {
if (this->dyna.actor.xzDistToPlayer < 250.0f) { if (this->dyna.actor.xzDistToPlayer < 250.0f) {
BgBdanObjects_SetContactRu1(this, 1); BgBdanObjects_SetProperty(this, JABU_OBJECTS_SET_PROP_CAM_SETTING_NORMAL1);
this->timer = 20; this->timer = 20;
OnePointCutscene_Init(play, 3070, -99, &this->dyna.actor, CAM_ID_MAIN); OnePointCutscene_Init(play, 3070, -99, &this->dyna.actor, CAM_ID_MAIN);
player->actor.world.pos.x = -1130.0f; player->actor.world.pos.x = -1130.0f;
@ -190,24 +205,24 @@ void func_8086C054(BgBdanObjects* this, PlayState* play) {
this->timer--; this->timer--;
} }
if (this->timer == 0) { if (this->timer == 0) {
this->actionFunc = func_8086C1A0; this->actionFunc = BgBdanObjects_OctoPlatform_RaiseToUpperPosition;
} }
} }
if (!Play_InCsMode(play) && !BgBdanObjects_GetContactRu1(this, 0)) { if (!Play_InCsMode(play) && !BgBdanObjects_GetProperty(this, JABU_OBJECTS_GET_PROP_CAM_SETTING_NORMAL0)) {
this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y + -79.0f; this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y + -79.0f;
} else { } else {
this->dyna.actor.world.pos.y = (this->dyna.actor.home.pos.y + -79.0f) - 5.0f; this->dyna.actor.world.pos.y = (this->dyna.actor.home.pos.y + -79.0f) - 5.0f;
} }
} }
void func_8086C1A0(BgBdanObjects* this, PlayState* play) { void BgBdanObjects_OctoPlatform_RaiseToUpperPosition(BgBdanObjects* this, PlayState* play) {
if (Math_SmoothStepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y + 500.0f, 0.5f, 7.5f, 1.0f) < if (Math_SmoothStepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y + 500.0f, 0.5f, 7.5f, 1.0f) <
0.1f) { 0.1f) {
Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BUYOSTAND_STOP_A); Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BUYOSTAND_STOP_A);
this->actionFunc = func_8086C29C; this->actionFunc = BgBdanObjects_OctoPlatform_WaitForRutoToAdvanceCutscene;
this->timer = 30; this->timer = 30;
BgBdanObjects_SetContactRu1(this, 2); BgBdanObjects_SetProperty(this, JABU_OBJECTS_SET_PROP_CAM_SETTING_DUNGEON0);
Rumble_Request(0.0f, 255, 20, 150); Rumble_Request(0.0f, 255, 20, 150);
} else { } else {
if (this->timer != 0) { if (this->timer != 0) {
@ -221,7 +236,11 @@ void func_8086C1A0(BgBdanObjects* this, PlayState* play) {
} }
} }
void func_8086C29C(BgBdanObjects* this, PlayState* play) { /**
* Again, this actionFunc is inescapable until En_Ru1 (Ruto) sets this
* actor's cameraSetting to DUNGEON1.
*/
void BgBdanObjects_OctoPlatform_WaitForRutoToAdvanceCutscene(BgBdanObjects* this, PlayState* play) {
s32 quakeIndex; s32 quakeIndex;
if (this->timer != 0) { if (this->timer != 0) {
@ -234,18 +253,18 @@ void func_8086C29C(BgBdanObjects* this, PlayState* play) {
} }
} }
if (BgBdanObjects_GetContactRu1(this, 3)) { if (BgBdanObjects_GetProperty(this, JABU_OBJECTS_GET_PROP_CAM_SETTING_DUNGEON1)) {
Actor_SpawnAsChild(&play->actorCtx, &this->dyna.actor, play, ACTOR_EN_BIGOKUTA, this->dyna.actor.world.pos.x, Actor_SpawnAsChild(&play->actorCtx, &this->dyna.actor, play, ACTOR_EN_BIGOKUTA, this->dyna.actor.world.pos.x,
this->dyna.actor.world.pos.y + 140.0f, this->dyna.actor.world.pos.z, 0, this->dyna.actor.world.pos.y + 140.0f, this->dyna.actor.world.pos.z, 0,
this->dyna.actor.shape.rot.y + 0x8000, 0, 0); this->dyna.actor.shape.rot.y + 0x8000, 0, 0);
BgBdanObjects_SetContactRu1(this, 4); BgBdanObjects_SetProperty(this, JABU_OBJECTS_SET_PROP_WATCHED_BIGOCTO_INTRO_CUTSCENE);
this->timer = 10; this->timer = 10;
this->actionFunc = func_8086C55C; this->actionFunc = BgBdanObjects_OctoPlatform_PauseBeforeDescending;
Camera_SetFinishedFlag(GET_ACTIVE_CAM(play)); Camera_SetFinishedFlag(GET_ACTIVE_CAM(play));
} }
} }
void func_8086C3D8(BgBdanObjects* this, PlayState* play) { void BgBdanObjects_OctoPlatform_DescendWithBigOcto(BgBdanObjects* this, PlayState* play) {
Player* player = GET_PLAYER(play); Player* player = GET_PLAYER(play);
this->dyna.actor.velocity.y += 0.5f; this->dyna.actor.velocity.y += 0.5f;
@ -255,7 +274,7 @@ void func_8086C3D8(BgBdanObjects* this, PlayState* play) {
this->timer = 60; this->timer = 60;
Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BUYOSTAND_STOP_U); Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BUYOSTAND_STOP_U);
this->dyna.actor.child->world.pos.y = this->dyna.actor.world.pos.y + 140.0f; this->dyna.actor.child->world.pos.y = this->dyna.actor.world.pos.y + 140.0f;
this->actionFunc = func_8086C5BC; this->actionFunc = BgBdanObjects_OctoPlatform_WaitForBigOctoToStartBattle;
OnePointCutscene_Init(play, 3080, -99, this->dyna.actor.child, CAM_ID_MAIN); OnePointCutscene_Init(play, 3080, -99, this->dyna.actor.child, CAM_ID_MAIN);
player->actor.world.pos.x = -1130.0f; player->actor.world.pos.x = -1130.0f;
player->actor.world.pos.y = -1025.0f; player->actor.world.pos.y = -1025.0f;
@ -278,63 +297,64 @@ void func_8086C3D8(BgBdanObjects* this, PlayState* play) {
} }
} }
void func_8086C55C(BgBdanObjects* this, PlayState* play) { void BgBdanObjects_OctoPlatform_PauseBeforeDescending(BgBdanObjects* this, PlayState* play) {
this->timer--; this->timer--;
if (this->timer == 0) { if (this->timer == 0) {
Flags_UnsetSwitch(play, this->switchFlag); Flags_UnsetSwitch(play, this->var.switchFlag);
} else if (this->timer == -40) { } else if (this->timer == -40) {
this->timer = 0; this->timer = 0;
this->actionFunc = func_8086C3D8; this->actionFunc = BgBdanObjects_OctoPlatform_DescendWithBigOcto;
} }
} }
void func_8086C5BC(BgBdanObjects* this, PlayState* play) { void BgBdanObjects_OctoPlatform_WaitForBigOctoToStartBattle(BgBdanObjects* this, PlayState* play) {
if (this->timer != 0) { if (this->timer != 0) {
this->timer--; this->timer--;
} }
if ((this->timer == 0) && (this->dyna.actor.child != NULL)) { if ((this->timer == 0) && (this->dyna.actor.child != NULL)) {
if (this->dyna.actor.child->params == 2) { if (this->dyna.actor.child->params == 2) {
this->actionFunc = func_8086C618; this->actionFunc = BgBdanObjects_OctoPlatform_BattleInProgress;
} else if (this->dyna.actor.child->params == 0) { } else if (this->dyna.actor.child->params == 0) {
this->dyna.actor.child->params = 1; this->dyna.actor.child->params = 1;
} }
} }
} }
void func_8086C618(BgBdanObjects* this, PlayState* play) { void BgBdanObjects_OctoPlatform_BattleInProgress(BgBdanObjects* this, PlayState* play) {
Collider_UpdateCylinder(&this->dyna.actor, &this->collider); Collider_UpdateCylinder(&this->dyna.actor, &this->collider);
CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider.base); CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider.base);
if (Flags_GetClear(play, this->dyna.actor.room)) { if (Flags_GetClear(play, this->dyna.actor.room)) {
Flags_SetSwitch(play, this->switchFlag); Flags_SetSwitch(play, this->var.switchFlag);
this->dyna.actor.home.rot.y = (s16)(this->dyna.actor.shape.rot.y + 0x2000) & 0xC000; this->dyna.actor.home.rot.y = (s16)(this->dyna.actor.shape.rot.y + 0x2000) & 0xC000;
this->actionFunc = func_8086C6EC; this->actionFunc = BgBdanObjects_SinkToFloorHeight;
} else { } else {
this->dyna.actor.shape.rot.y += this->dyna.actor.world.rot.y; this->dyna.actor.shape.rot.y += this->dyna.actor.world.rot.y;
func_800F436C(&this->dyna.actor.projectedPos, 0x2063, ABS(this->dyna.actor.world.rot.y) / 512.0f); func_800F436C(&this->dyna.actor.projectedPos, NA_SE_EV_ROLL_STAND - SFX_FLAG,
ABS(this->dyna.actor.world.rot.y) / 512.0f);
} }
} }
void func_8086C6EC(BgBdanObjects* this, PlayState* play) { void BgBdanObjects_SinkToFloorHeight(BgBdanObjects* this, PlayState* play) {
s32 cond = Math_ScaledStepToS(&this->dyna.actor.shape.rot.y, this->dyna.actor.home.rot.y, 0x200); s32 cond = Math_ScaledStepToS(&this->dyna.actor.shape.rot.y, this->dyna.actor.home.rot.y, 0x200);
if (Math_StepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y + -125.0f, 3.0f)) { if (Math_StepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y + -125.0f, 3.0f)) {
if (cond) { if (cond) {
this->actionFunc = func_8086C76C; this->actionFunc = BgBdanObjects_WaitForPlayerInRange;
} }
} }
} }
void func_8086C76C(BgBdanObjects* this, PlayState* play) { void BgBdanObjects_WaitForPlayerInRange(BgBdanObjects* this, PlayState* play) {
if (DynaPolyActor_IsPlayerOnTop(&this->dyna)) { if (DynaPolyActor_IsPlayerOnTop(&this->dyna)) {
if (this->dyna.actor.xzDistToPlayer < 120.0f) { if (this->dyna.actor.xzDistToPlayer < 120.0f) {
this->actionFunc = func_8086C7D0; this->actionFunc = BgBdanObjects_RaiseToUpperPosition;
OnePointCutscene_Init(play, 3090, -99, &this->dyna.actor, CAM_ID_MAIN); OnePointCutscene_Init(play, 3090, -99, &this->dyna.actor, CAM_ID_MAIN);
} }
} }
} }
void func_8086C7D0(BgBdanObjects* this, PlayState* play) { void BgBdanObjects_RaiseToUpperPosition(BgBdanObjects* this, PlayState* play) {
if (Math_SmoothStepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y + 965.0f, 0.5f, 15.0f, 0.2f) < if (Math_SmoothStepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y + 965.0f, 0.5f, 15.0f, 0.2f) <
0.01f) { 0.01f) {
Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BUYOSTAND_STOP_A); Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BUYOSTAND_STOP_A);
@ -347,25 +367,25 @@ void func_8086C7D0(BgBdanObjects* this, PlayState* play) {
void BgBdanObjects_DoNothing(BgBdanObjects* this, PlayState* play) { void BgBdanObjects_DoNothing(BgBdanObjects* this, PlayState* play) {
} }
void func_8086C874(BgBdanObjects* this, PlayState* play) { void BgBdanObjects_ElevatorOscillate(BgBdanObjects* this, PlayState* play) {
if (this->timer != 0) { if (this->timer != 0) {
this->timer--; this->timer--;
} }
if (this->switchFlag == 0) { if (this->var.camChangeTimer == 0) {
if (DynaPolyActor_IsPlayerOnTop(&this->dyna)) { if (DynaPolyActor_IsPlayerOnTop(&this->dyna)) {
this->cameraSetting = play->cameraPtrs[CAM_ID_MAIN]->setting; this->cameraSetting = play->cameraPtrs[CAM_ID_MAIN]->setting;
Camera_RequestSetting(play->cameraPtrs[CAM_ID_MAIN], CAM_SET_NORMAL2); Camera_RequestSetting(play->cameraPtrs[CAM_ID_MAIN], CAM_SET_NORMAL2);
Camera_UnsetStateFlag(play->cameraPtrs[CAM_ID_MAIN], CAM_STATE_CHECK_BG); Camera_UnsetStateFlag(play->cameraPtrs[CAM_ID_MAIN], CAM_STATE_CHECK_BG);
this->switchFlag = 10; this->var.camChangeTimer = 10;
} }
} else { } else {
Camera_RequestSetting(play->cameraPtrs[CAM_ID_MAIN], CAM_SET_NORMAL2); Camera_RequestSetting(play->cameraPtrs[CAM_ID_MAIN], CAM_SET_NORMAL2);
if (!DynaPolyActor_IsPlayerOnTop(&this->dyna)) { if (!DynaPolyActor_IsPlayerOnTop(&this->dyna)) {
if (this->switchFlag != 0) { if (this->var.camChangeTimer != 0) {
this->switchFlag--; this->var.camChangeTimer--;
} }
} }
if (this->switchFlag == 0) { if (this->var.camChangeTimer == 0) {
if (1) {} if (1) {}
Camera_RequestSetting(play->cameraPtrs[CAM_ID_MAIN], this->cameraSetting); Camera_RequestSetting(play->cameraPtrs[CAM_ID_MAIN], this->cameraSetting);
Camera_SetStateFlag(play->cameraPtrs[CAM_ID_MAIN], CAM_STATE_CHECK_BG); Camera_SetStateFlag(play->cameraPtrs[CAM_ID_MAIN], CAM_STATE_CHECK_BG);
@ -378,50 +398,50 @@ void func_8086C874(BgBdanObjects* this, PlayState* play) {
} }
} }
void func_8086C9A8(BgBdanObjects* this, PlayState* play) { void BgBdanObjects_WaitForSwitch(BgBdanObjects* this, PlayState* play) {
if (Flags_GetSwitch(play, this->switchFlag)) { if (Flags_GetSwitch(play, this->var.switchFlag)) {
this->timer = 100; this->timer = 100;
this->actionFunc = func_8086C9F0; this->actionFunc = BgBdanObjects_ChangeWaterBoxLevel;
} }
} }
void func_8086C9F0(BgBdanObjects* this, PlayState* play) { void BgBdanObjects_ChangeWaterBoxLevel(BgBdanObjects* this, PlayState* play) {
if (this->timer == 0) { if (this->timer == 0) {
if (Math_StepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y, 0.5f)) { if (Math_StepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y, 0.5f)) {
Flags_UnsetSwitch(play, this->switchFlag); Flags_UnsetSwitch(play, this->var.switchFlag);
this->actionFunc = func_8086C9A8; this->actionFunc = BgBdanObjects_WaitForSwitch;
} }
func_8002F948(&this->dyna.actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); func_8002F948(&this->dyna.actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG);
} else { } else {
if (Math_StepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y + 75.0f, 0.5f)) { if (Math_StepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y + 75.0f, 0.5f)) {
this->actionFunc = func_8086CABC; this->actionFunc = BgBdanObjects_WaitForTimerExpired;
} }
func_8002F948(&this->dyna.actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); func_8002F948(&this->dyna.actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG);
} }
play->colCtx.colHeader->waterBoxes[7].ySurface = this->dyna.actor.world.pos.y; play->colCtx.colHeader->waterBoxes[7].ySurface = this->dyna.actor.world.pos.y;
} }
void func_8086CABC(BgBdanObjects* this, PlayState* play) { void BgBdanObjects_WaitForTimerExpired(BgBdanObjects* this, PlayState* play) {
if (this->timer != 0) { if (this->timer != 0) {
this->timer--; this->timer--;
} }
func_8002F994(&this->dyna.actor, this->timer); func_8002F994(&this->dyna.actor, this->timer); // play ticking sound effect
if (this->timer == 0) { if (this->timer == 0) {
this->actionFunc = func_8086C9F0; this->actionFunc = BgBdanObjects_ChangeWaterBoxLevel;
} }
} }
void func_8086CB10(BgBdanObjects* this, PlayState* play) { void BgBdanObjects_WaitForPlayerOnTop(BgBdanObjects* this, PlayState* play) {
if (DynaPolyActor_IsPlayerOnTop(&this->dyna)) { if (DynaPolyActor_IsPlayerOnTop(&this->dyna)) {
Flags_SetSwitch(play, this->switchFlag); Flags_SetSwitch(play, this->var.switchFlag);
this->timer = 50; this->timer = 50;
this->actionFunc = func_8086CB8C; this->actionFunc = BgBdanObjects_FallToLowerPos;
this->dyna.actor.home.pos.y -= 200.0f; this->dyna.actor.home.pos.y -= 200.0f;
OnePointCutscene_Init(play, 3100, 51, &this->dyna.actor, CAM_ID_MAIN); OnePointCutscene_Init(play, 3100, 51, &this->dyna.actor, CAM_ID_MAIN);
} }
} }
void func_8086CB8C(BgBdanObjects* this, PlayState* play) { void BgBdanObjects_FallToLowerPos(BgBdanObjects* this, PlayState* play) {
if (this->timer != 0) { if (this->timer != 0) {
this->timer--; this->timer--;
} }
@ -448,15 +468,15 @@ void BgBdanObjects_Update(Actor* thisx, PlayState* play) {
void BgBdanObjects_Draw(Actor* thisx, PlayState* play) { void BgBdanObjects_Draw(Actor* thisx, PlayState* play) {
BgBdanObjects* this = (BgBdanObjects*)thisx; BgBdanObjects* this = (BgBdanObjects*)thisx;
if (thisx->params == 0) { if (thisx->params == JABU_OBJECTS_TYPE_BIG_OCTO_PLATFORM) {
if (this->actionFunc == func_8086C054) { if (this->actionFunc == BgBdanObjects_OctoPlatform_WaitForRutoToStartCutscene) {
if (((thisx->home.pos.y + -79.0f) - 5.0f) < thisx->world.pos.y) { if (((thisx->home.pos.y + -79.0f) - 5.0f) < thisx->world.pos.y) {
Matrix_Translate(0.0f, -50.0f, 0.0f, MTXMODE_APPLY); Matrix_Translate(0.0f, -50.0f, 0.0f, MTXMODE_APPLY);
} }
} }
} }
if (thisx->params == 2) { if (thisx->params == JABU_OBJECTS_TYPE_WATERBOX_HEIGHT_CHANGER) {
Gfx_DrawDListXlu(play, gJabuWaterDL); Gfx_DrawDListXlu(play, gJabuWaterDL);
} else { } else {
Gfx_DrawDListOpa(play, sDLists[thisx->params]); Gfx_DrawDListOpa(play, sDLists[thisx->params]);

12
src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h
View file

@ -6,12 +6,22 @@
struct BgBdanObjects; struct BgBdanObjects;
typedef enum {
JABU_OBJECTS_TYPE_BIG_OCTO_PLATFORM,
JABU_OBJECTS_TYPE_SMALL_AUTO_ELEVATOR,
JABU_OBJECTS_TYPE_WATERBOX_HEIGHT_CHANGER,
JABU_OBJECTS_TYPE_FALLING_PLATFORM
} BgBdanObjectsType;
typedef void (*BgBdanObjectsActionFunc)(struct BgBdanObjects*, PlayState*); typedef void (*BgBdanObjectsActionFunc)(struct BgBdanObjects*, PlayState*);
typedef struct BgBdanObjects { typedef struct BgBdanObjects {
/* 0x0000 */ DynaPolyActor dyna; /* 0x0000 */ DynaPolyActor dyna;
/* 0x0164 */ BgBdanObjectsActionFunc actionFunc; /* 0x0164 */ BgBdanObjectsActionFunc actionFunc;
/* 0x0168 */ u8 switchFlag; union {
/* 0x0168 */ u8 switchFlag;
/* 0x0168 */ u8 camChangeTimer;
} var;
/* 0x016A */ s16 timer; /* 0x016A */ s16 timer;
/* 0x016C */ ColliderCylinder collider; /* 0x016C */ ColliderCylinder collider;
/* 0x01B8 */ s32 cameraSetting; /* 0x01B8 */ s32 cameraSetting;