Fix crash when learning non-warp songs during Nayru#2557
Merged
Conversation
fenhl
approved these changes
Apr 20, 2026
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
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.
Fix risk of crashing when learning non-warp songs with cutscenes and playback enabled. Fixes #1089.
Vanilla bug that is actually "fixed" already in randomizer by skipping cutscenes and song playback when learning songs. However I asked in the Discord, and considering it is a fatal crash bug if encountered, I'll send in the fix in case someone would enable the song playback, either in their own build or as a setting.
For more technical background see the issue linked above. Basically increase the number of frames between Nayru killed and Ocarina effect spawning by 1, so they don't overlap.
Testing
Tested in Ares 1.47, Project64 3.0.1 and Mupen64plus 2.8.
Looks like this, before and after: https://www.youtube.com/watch?v=ds8jJb_2iNc
To re-enable cutscenes and playback for Sun's Song and Saria's song I commented out this code.
In hacks.asm:
In Cutscenes.py,
patch_cutscenes: