thirdpartymirrors/Zelda64Recomp
1
0
Fork 0
mirror of https://github.com/Zelda64Recomp/Zelda64Recomp.git synced 2026-04-26 12:11:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simple addition of a CHECK_EVENTINF to prevent the bug I experienced from occurring.

Browse source
This commit is contained in:
Doctor Dink 2025-07-31 14:14:22 -04:00
parent bb7030bcd1
commit 258f4f9dc8
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
patches/autosaving.c
View file

@ -31,7 +31,7 @@ RECOMP_PATCH void KaleidoSetup_Update(PlayState* play) {
if (!Play_InCsMode(play) || ((msgCtx->msgMode != MSGMODE_NONE) && (msgCtx->currentTextId == 0xFF))) { if (!Play_InCsMode(play) || ((msgCtx->msgMode != MSGMODE_NONE) && (msgCtx->currentTextId == 0xFF))) {
if ((play->unk_1887C < 2) && (gSaveContext.magicState != MAGIC_STATE_STEP_CAPACITY) && if ((play->unk_1887C < 2) && (gSaveContext.magicState != MAGIC_STATE_STEP_CAPACITY) &&
(gSaveContext.magicState != MAGIC_STATE_FILL)) { (gSaveContext.magicState != MAGIC_STATE_FILL)) {
if (!CHECK_EVENTINF(EVENTINF_17) && !(player->stateFlags1 & PLAYER_STATE1_20)) { if (!CHECK_EVENTINF(EVENTINF_17) && !(player->stateFlags1 & PLAYER_STATE1_20) && !(CHECK_EVENTINF(EVENTINF_41))) {
if (!(play->actorCtx.flags & ACTORCTX_FLAG_TELESCOPE_ON) && if (!(play->actorCtx.flags & ACTORCTX_FLAG_TELESCOPE_ON) &&
!(play->actorCtx.flags & ACTORCTX_FLAG_PICTO_BOX_ON)) { !(play->actorCtx.flags & ACTORCTX_FLAG_PICTO_BOX_ON)) {
if (!play->actorCtx.isOverrideInputOn) { if (!play->actorCtx.isOverrideInputOn) {
@ -74,6 +74,10 @@ RECOMP_DECLARE_EVENT(recomp_on_autosave(PlayState* play));
RECOMP_DECLARE_EVENT(recomp_after_autosave(PlayState* play)); RECOMP_DECLARE_EVENT(recomp_after_autosave(PlayState* play));
RECOMP_EXPORT void recomp_do_autosave(PlayState* play) { RECOMP_EXPORT void recomp_do_autosave(PlayState* play) {
// Tell console we are autosaving for debugging
recomp_printf("Triggering auto save at %d \n", gSaveContext.save.time);
//recomp_printf("Loaded entrance: %d in scene: %d\n", autosave_entrance, scene_id);
// @recomp_event recomp_on_autosave(PlayState* play): Autosave triggered. // @recomp_event recomp_on_autosave(PlayState* play): Autosave triggered.
recomp_on_autosave(play); recomp_on_autosave(play);
// Transfer the scene flags into the cycle flags. // Transfer the scene flags into the cycle flags.