Skip to content

Enhancement, add SoT blocks to one point cutscene skip #6848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
djevangelia wants to merge 1 commit into
base: develop
Choose a base branch
from
+26 −3
Open

Enhancement, add SoT blocks to one point cutscene skip #6848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions soh/soh/Enhancements/TimeSavers/timesaver_hook_handlers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,14 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
}
break;
}
case VB_PLAY_TIMEBLOCK_CS: {
if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint"), IS_RANDO)) {
// Turn camera as if SoT block cutscene
func_800C0808(gPlayState, 0, GET_PLAYER(gPlayState), CAM_SET_CS_ATTENTION);
*should = false;
}
break;
}
case VB_PLAY_GORON_FREE_CS: {
if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
*should = false;
Expand Down
8 changes: 8 additions & 0 deletions soh/soh/Enhancements/game-interactor/vanilla-behavior/GIVanillaBehavior.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1743,6 +1743,14 @@ typedef enum {
// - `*EnDaiku`
VB_PLAY_CARPENTER_FREE_CS,

// #### `result`
// ```c
// true if one point cutscene skip not enabled, or not randomizer
// ```
// #### `args`
// - none
VB_PLAY_TIMEBLOCK_CS,

// #### `result`
// Close enough & various cutscene checks
// ```c
Expand Down
13 changes: 10 additions & 3 deletions soh/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

#include "z_obj_timeblock.h"
#include "objects/object_timeblock/object_timeblock.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"

#define FLAGS \
(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA | \
Expand Down Expand Up @@ -218,8 +219,10 @@ void ObjTimeblock_Normal(ObjTimeblock* this, PlayState* play) {
ObjTimeblock_SpawnDemoEffect(this, play);
this->demoEffectTimer = 160;

// Possibly points the camera to this actor

@serprex serprex Jul 2, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should keep comment, https://github.com/zeldaret/oot/blob/269d03016cd0e3d7a0b8925e02b97a319c1d0e8d/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c#L235

OnePointCutscene_Attention(play, &this->dyna.actor);
if (GameInteractor_Should(VB_PLAY_TIMEBLOCK_CS, true, this)) {
OnePointCutscene_Attention(play, &this->dyna.actor);
}

// "◯◯◯◯ Time Block Attention Camera (frame counter %d)\n"
osSyncPrintf("◯◯◯◯ Time Block 注目カメラ (frame counter %d)\n", play->state.frames);

Expand Down Expand Up @@ -277,7 +280,11 @@ void ObjTimeblock_AltBehaviorVisible(ObjTimeblock* this, PlayState* play) {
this->demoEffectFirstPartTimer = 12;
ObjTimeblock_SpawnDemoEffect(this, play);
this->demoEffectTimer = 160;
OnePointCutscene_Attention(play, &this->dyna.actor);

if (GameInteractor_Should(VB_PLAY_TIMEBLOCK_CS, true, this)) {
OnePointCutscene_Attention(play, &this->dyna.actor);
}

// "Time Block Attention Camera (frame counter)"
osSyncPrintf("◯◯◯◯ Time Block 注目カメラ (frame counter %d)\n", play->state.frames);
ObjTimeblock_ToggleSwitchFlag(play, this->dyna.actor.params & 0x3F);
Expand Down
Loading