Fix skip intro and skip first cycle logic running when it shouldn't #846
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.
The Skip Intro and Skip First Cycle enhancements were running every time a save was loaded from File Select that previously used the enhancements. This is because in
Sram_OpenSave
the following check is performed which decides where the player should load in.What was happening is that
save.isFirstCycle
was not properly set by our enhancements, which meant the intro cutscene entrance is set, triggering our enhancements over and over.This
save.isFirstCycle
is poorly named, it doesn't mean "currently in the first cycle", rather it means "link has entered clock town at least once". Basically it is just set once the game auto saves after entering clock town for the first time.I've reworked both enhancements to bail out early if this flag is already set, and made it so the Skip Intro portion correctly sets the flag, while removing an incorrect unsetting of this flag in the Skip First Cycle portion.
Also removed needless conditional checks for setting flags since the operations will only run once.
Build Artifacts