Skip to content

Skip water level change cutscenes in Water Temple#4726

Merged
Malkierian merged 2 commits intoHarbourMasters:developfrom
JordanLongstaff:skip-water-level-cs
Dec 21, 2024
Merged

Skip water level change cutscenes in Water Temple#4726
Malkierian merged 2 commits intoHarbourMasters:developfrom
JordanLongstaff:skip-water-level-cs

Conversation

@JordanLongstaff
Copy link
Contributor

@JordanLongstaff JordanLongstaff commented Dec 19, 2024

Fixes #4702

skip-water-level-cs.mp4

Build Artifacts

@Malkierian
Copy link
Contributor

We had some issues elsewhere with the HUD disappearing, and that was recent. Anyone remember what it was related to?

@Pepper0ni
Copy link
Contributor

https://github.com/HarbourMasters/Shipwright/pull/4599/files#diff-982cfbf0bad0eb2775240639bbf4d287f41f9c86b7046ed60ae13af779303af8R865 this is the change that fixed the previous issue, however this UI removal seems to be more total than the one from that issue so is probably something else

@JordanLongstaff
Copy link
Contributor Author

OK, I found an easy fix. It seems to be that the game thinks there's still a textbox open (which causes the HUD to not be shown) and doesn't formally close it until the end of the cutscene. So I just added a Message_CloseTextbox call into the hook.

@Malkierian
Copy link
Contributor

Brilliant. And you even updated the video.

@Malkierian
Copy link
Contributor

Oh wait, before I merge it, does the CloseTextbox call affect the other CS in that case fallthrough? Does it perhaps solve a similar issue there, or are there perhaps negative consequences? (do you even know what cutscenes those are? stupid magic numbers...)

@JordanLongstaff
Copy link
Contributor Author

does the CloseTextbox call affect the other CS in that case fallthrough?

I admit I'm getting a little concerned about this being a catch-all for multiple cutscenes with specific needs, but for now I can confirm that they aren't causing any issues.

The cutscene IDs listed there are, in order:

  1. 3120 = water level changing in Water Temple
  2. 3150 = Amy's painting shot in Forest Temple, blocks fall
  3. 4180 = boulder blocking Dodongo's Cavern entrance bombed
  4. 4100 = Sleeping Waterfall opens

The Water Temple one is the only one with a textbox to close (it'll just do nothing for the others) and the Sleeping Waterfall one is the only one with a nearby BgSpot03Taki* object (again, nothing happens for the others).

@Malkierian Malkierian merged commit 845e379 into HarbourMasters:develop Dec 21, 2024
Pepper0ni pushed a commit to Pepper0ni/Shipwright that referenced this pull request Dec 23, 2024
* Skip water level change cutscenes in Water Temple

* Fix disappearing HUD issue
@JordanLongstaff JordanLongstaff deleted the skip-water-level-cs branch December 24, 2024 02:39
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.

Changing the water level in Water Temple Causes a OnePoint to play with all skips on

3 participants