Skip to content
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.

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

Fix skipping Adult Ruto one-point cutscene #4519

Merged

Conversation

JordanLongstaff
Copy link
Contributor

@JordanLongstaff JordanLongstaff commented Nov 4, 2024

Fixes #4505

Added the hook to skip the cutscene with Adult Ruto in the Water Temple, so she simply doesn't appear.

Build Artifacts

Copy link
Contributor

@Archez Archez left a comment

Choose a reason for hiding this comment

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

  • The change to z_onepointdemo.c is not something that I would like us to do to the game's source.
  • Although this cutscene is technically a onepoint actor CS, from a user perspective the CS is much more like a story cutscene.

I think the handling for this should be moved under a story cutscene check. Additionally, we probably should just kill Ruto's actor on init and also set the scene flag switch marking the cutscene as "complete". This would avoid the need to deal with the camera.
Be mindful to only do this when in water temple, so that ruto in other scenes is unaffected.

@Malkierian Malkierian merged commit a919b6a into HarbourMasters:develop Nov 7, 2024
5 checks passed
@JordanLongstaff JordanLongstaff deleted the adult-ruto-skip-cutscene branch November 7, 2024 13:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Adult Ruto reintroduction cutscene in Water Temple ignores cutscene skip settings
3 participants