Merged
Conversation
balloondude2
approved these changes
Sep 22, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
There is a softlock scenario in the Bio Deku Baba grotto where the player enters the water as FD but does not have the Zora Mask. The Zora Mask is normally the only usable item when swimming in water. FD's awkward size makes lily pads and the ledge in that particular grotto ungrabbable. This PR ensures FD Mask is usable in water, which is convenient beyond the softlock fix.
Another softlock is particular to rando with boss souls shuffled. Twinmold's Lair itself determines whether the Giant's Mask is usable, but the Twinmold actor handles the transformation. If the player uses the Giant's Mask without Twinmold's Soul, Link will be stuck in a neverending transformation. This PR opts to disable the Giant's Mask if Boss Souls are shuffled but Twinmold's Soul is not obtained.
I moved and renamed
VB_DISABLE_ITEM_UNDERWATER_FLOORtoVB_DISABLE_ITEM_UNDERWATERso as to avoid introducing VB hell in a concentrated area. I updated the Underwater Ocarina enhancement accordingly.Fixes #1264 and part of #647
Build Artifacts