summaryrefslogtreecommitdiff
path: root/soh/src
diff options
context:
space:
mode:
authorPhilip Dubé <159546+serprex@users.noreply.github.com>2026-09-17 02:09:18 +0000
committerGitHub <noreply@github.com>2026-09-17 02:09:18 +0000
commit02c7632a333675cbd88a255b870716c9361df774 (patch)
tree011df760511038bc805b84ffcf0ac82dcf481ef3 /soh/src
parent01a4f3693d111695e3bcf02e554c5d3dbdb9799a (diff)
Fix boolean logic error breaking Talon cutscene skip (#7211)HEADdevelop
Diffstat (limited to 'soh/src')
-rw-r--r--soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c
index 13a1dcee8..1c7e05d04 100644
--- a/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c
+++ b/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c
@@ -461,13 +461,10 @@ void EnTa_RunAwayStart(EnTa* this, PlayState* play) {
void EnTa_TalkAwakeInCastle(EnTa* this, PlayState* play) {
if (Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) {
- s16 csCamIdx = OnePointCutscene_Init(play, 4175, -99, &this->actor, CAM_ID_MAIN);
+ OnePointCutscene_Init(play, 4175, -99, &this->actor, CAM_ID_MAIN);
EnTa_SetupAction(this, EnTa_RunAwayStart, EnTa_AnimRepeatCurrent);
this->timer = 5;
Flags_SetEventChkInf(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE);
- if (GameInteractor_Should(VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
- OnePointCutscene_EndCutscene(play, csCamIdx);
- }
Animation_PlayOnce(&this->skelAnime, &gTalonRunTransitionAnim);
this->currentAnimation = &gTalonRunAnim;
}