Fix Clock Door SoT Hint logic - #181
Merged
Merged
Conversation
pizza1398
commented
Jul 23, 2026
pizza1398
commented
- Fix crash when determining first Clock Door hint
- Put Remains hints after Ocarina's if SoT isn't shuffled
- Only play Tatl sound on SoT hint if it was first
- Fix crash when determining first Clock Door hint - Put Remains hints after Ocarina's if SoT isn't shuffled - Only play Tatl sound on SoT hint if it was first
Tacoman369
pushed a commit
that referenced
this pull request
Jul 24, 2026
- Fix crash when determining first Clock Door hint - Put Remains hints after Ocarina's if SoT isn't shuffled - Only play Tatl sound on SoT hint if it was first
PhlexPlexico
pushed a commit
that referenced
this pull request
Jul 26, 2026
- Fix crash when determining first Clock Door hint - Put Remains hints after Ocarina's if SoT isn't shuffled - Only play Tatl sound on SoT hint if it was first
PhlexPlexico
added a commit
that referenced
this pull request
Jul 27, 2026
* FairySanity
- Implements logic for shuffling Stray Fairies with the same settings as other Dungeon Items ("Vanilla", "Start With", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere")
- Add StrayFairy override type
- Adjust Stray Fairy GetItemIDs
- Create custom messages for Stray Fairies
* fairysanity 2
implement Own Dungeon Any Dungeon and overworld
add new hints to replace vanilla text with the randomized item for bank reward and deku salesman
* Fill Fixes
- Fixes item filling for Stray Fairies so they are placed properly according to the setting selected.
- Removes WIP tag from Stray Fairy shuffle descriptions
- Fixes text layout for new Other Hints so they properly compile
- Adds new setting to separately shuffle the Clock Town Stray Fairy as it is not a dungeon item like the others
- Add override values to stray fairies
* Update fill.cpp
Remove Anju & kafei placement as it is no longer needed
also remove block comment that is unused and will not be used
* SoT Hint
- Adds SoT hint to the Clock Tower Door if it's shuffled
- Adds custom text to Beavers to replace "Empty Bottle" with the item it's been randomized to.
* Fix Clock Door SoT Hint logic (#181)
- Fix crash when determining first Clock Door hint
- Put Remains hints after Ocarina's if SoT isn't shuffled
- Only play Tatl sound on SoT hint if it was first
* Update Z3DR
* Clock Town Fairy Fix
- Adjusts flag value so Clock Town Stray Fairy properly overrides
- Adds new override for the Clock Town Stray Fairy when it's in East Clock Town
* Update item_location.cpp
-Adjust scene for several Stone Tower Stray Fairies so they override properly
* Update item_location.cpp
* Update Z3DR
* fix: Point submodule back to dev.
---------
Co-authored-by: Tacoman369 <90735287+Tacoman369@users.noreply.github.com>
Co-authored-by: pizza1398 <259104093+pizza1398@users.noreply.github.com>
Tacoman369
added a commit
that referenced
this pull request
Jul 28, 2026
* Update Z3DR
* FairySanity
- Implements logic for shuffling Stray Fairies with the same settings as other Dungeon Items ("Vanilla", "Start With", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere")
- Add StrayFairy override type
- Adjust Stray Fairy GetItemIDs
- Create custom messages for Stray Fairies
* fairysanity 2
implement Own Dungeon Any Dungeon and overworld
add new hints to replace vanilla text with the randomized item for bank reward and deku salesman
* Fill Fixes
- Fixes item filling for Stray Fairies so they are placed properly according to the setting selected.
- Removes WIP tag from Stray Fairy shuffle descriptions
- Fixes text layout for new Other Hints so they properly compile
- Adds new setting to separately shuffle the Clock Town Stray Fairy as it is not a dungeon item like the others
- Add override values to stray fairies
* Update fill.cpp
Remove Anju & kafei placement as it is no longer needed
also remove block comment that is unused and will not be used
* SoT Hint
- Adds SoT hint to the Clock Tower Door if it's shuffled
- Adds custom text to Beavers to replace "Empty Bottle" with the item it's been randomized to.
* Fix Clock Door SoT Hint logic (#181)
- Fix crash when determining first Clock Door hint
- Put Remains hints after Ocarina's if SoT isn't shuffled
- Only play Tatl sound on SoT hint if it was first
* Update Z3DR
* Clock Town Fairy Fix
- Adjusts flag value so Clock Town Stray Fairy properly overrides
- Adds new override for the Clock Town Stray Fairy when it's in East Clock Town
* Update item_location.cpp
-Adjust scene for several Stone Tower Stray Fairies so they override properly
* Update item_location.cpp
* Update Z3DR
* FairySanity
- Implements logic for shuffling Stray Fairies with the same settings as other Dungeon Items ("Vanilla", "Start With", "Own Dungeon", "Any Dungeon", "Overworld", "Anywhere")
- Add StrayFairy override type
- Adjust Stray Fairy GetItemIDs
- Create custom messages for Stray Fairies
* fairysanity 2
implement Own Dungeon Any Dungeon and overworld
add new hints to replace vanilla text with the randomized item for bank reward and deku salesman
* Fill Fixes
- Fixes item filling for Stray Fairies so they are placed properly according to the setting selected.
- Removes WIP tag from Stray Fairy shuffle descriptions
- Fixes text layout for new Other Hints so they properly compile
- Adds new setting to separately shuffle the Clock Town Stray Fairy as it is not a dungeon item like the others
- Add override values to stray fairies
* Update fill.cpp
Remove Anju & kafei placement as it is no longer needed
also remove block comment that is unused and will not be used
* SoT Hint
- Adds SoT hint to the Clock Tower Door if it's shuffled
- Adds custom text to Beavers to replace "Empty Bottle" with the item it's been randomized to.
* Fix Clock Door SoT Hint logic (#181)
- Fix crash when determining first Clock Door hint
- Put Remains hints after Ocarina's if SoT isn't shuffled
- Only play Tatl sound on SoT hint if it was first
* Update Z3DR
* Clock Town Fairy Fix
- Adjusts flag value so Clock Town Stray Fairy properly overrides
- Adds new override for the Clock Town Stray Fairy when it's in East Clock Town
* Update item_location.cpp
-Adjust scene for several Stone Tower Stray Fairies so they override properly
* Update item_location.cpp
* Update Z3DR
* fix: Point submodule back to dev.
* Update Z3DR
---------
Co-authored-by: pizza1398 <259104093+pizza1398@users.noreply.github.com>
Co-authored-by: Phlex <3514085+PhlexPlexico@users.noreply.github.com>
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.