Skip to content

[Feature] Remove performDelayedSave functionality from Autosave#3387

Merged
briaguya0 merged 4 commits intoHarbourMasters:develop-macreadyfrom
Malkierian:remove-delayed-save
Nov 14, 2023
Merged

[Feature] Remove performDelayedSave functionality from Autosave#3387
briaguya0 merged 4 commits intoHarbourMasters:develop-macreadyfrom
Malkierian:remove-delayed-save

Conversation

@Malkierian
Copy link
Contributor

@Malkierian Malkierian commented Nov 12, 2023

Originally, there was a problem with performDelayedSave still being true through resets out of grottos, fairy fountains, or Bombchu Bowling. However, with the entrance overriding that happens in Sram_OpenSave to prevent loading into grottos or fairy fountains with the Remember Save Location enhancement, and the fact that you can still manually save in those locations anyway, it really isn't necessary to keep the delayed save functionality anymore. Bombchu Bowling works just fine as a spawn in point. The check for Chamber of Sages was moved to the top of the checks in Autosave alongside the check for savedSceneNum being SCENE_GANON_BOSS, for obvious reasons for both, and grottos and fairy fountains are already handled in file loading.

Also moved performSave to a local variable within AutoSave(), as it is not referenced anywhere else in code.

Includes Archez's pending Temp B fix to prevent autosave from saving swapped B items.

Build Artifacts

@Malkierian Malkierian changed the base branch from develop to develop-macready November 12, 2023 08:02
@Archez
Copy link
Contributor

Archez commented Nov 12, 2023

Note: this removal of the delay also removes the logic of preventing a save in fishing pond/bombchu bowling from saving the temp B (which causes sticks on B after a reload from that save or the minigame item to persist)

I intend on implementing a much better solution for temp B saving since there are still some ways for that to happen and I think it's the main cause of the "sticks on B" cases we've been seeing.

@briaguya0
Copy link
Contributor

good catch @Archez, guess the MacReady fix will need to be the "just make sure to set performDelayedSave to false on reset" one

@Malkierian
Copy link
Contributor Author

Archez's Temp B fix has now been merged to this PR's branch, so this has everything again and should be good for final scrutiny.

@briaguya0 briaguya0 merged commit 4e9040d into HarbourMasters:develop-macready Nov 14, 2023
@Malkierian Malkierian deleted the remove-delayed-save branch November 14, 2023 21:38
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.

4 participants