github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-19 13:00:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Restore save confirmation screen when saving and in game over (N64) (#1750)

Browse source 
* Restore save confirmation screen

* Use correct time from NTSC decomp

* Apply suggested changes

* Update GameMenuBar.cpp
This commit is contained in:
Amaro Martínez 2022-10-23 02:40:47 -05:00 • committed by GitHub
commit fc1a009953
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
soh/soh/GameMenuBar.cpp
View file

@ -344,6 +344,8 @@ namespace GameMenuBar {
// Restore old Gold Skulltula cutscene // Restore old Gold Skulltula cutscene
CVar_SetS32("gGsCutscene", 0); CVar_SetS32("gGsCutscene", 0);
// Skip save confirmation
CVar_SetS32("gSkipSaveConfirmation", 0);
// Autosave // Autosave
CVar_SetS32("gAutosave", 0); CVar_SetS32("gAutosave", 0);
@ -410,6 +412,8 @@ namespace GameMenuBar {
CVar_SetS32("gN64WeirdFrames", 1); CVar_SetS32("gN64WeirdFrames", 1);
// Bombchus out of bounds // Bombchus out of bounds
CVar_SetS32("gBombchusOOB", 1); CVar_SetS32("gBombchusOOB", 1);
// Skip save confirmation
CVar_SetS32("gSkipSaveConfirmation", 1);
} }
void applyEnhancementPresetEnhanced(void) { void applyEnhancementPresetEnhanced(void) {
@ -819,6 +823,8 @@ namespace GameMenuBar {
UIWidgets::PaddedEnhancementCheckbox("Remember Save Location", "gRememberSaveLocation", true, false); UIWidgets::PaddedEnhancementCheckbox("Remember Save Location", "gRememberSaveLocation", true, false);
UIWidgets::Tooltip("When loading a save, places Link at the last entrance he went through.\n" UIWidgets::Tooltip("When loading a save, places Link at the last entrance he went through.\n"
"This doesn't work if the save was made in a grotto."); "This doesn't work if the save was made in a grotto.");
UIWidgets::PaddedEnhancementCheckbox("Skip save confirmation", "gSkipSaveConfirmation", true, false);
UIWidgets::Tooltip("Skip the \"Game saved.\" confirmation screen");
ImGui::EndMenu(); ImGui::EndMenu();
} }

8
soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
View file

@ -1527,6 +1527,10 @@ void KaleidoScope_DrawPages(GlobalContext* globalCtx, GraphicsContext* gfxCtx) {
POLY_KAL_DISP = POLY_KAL_DISP =
KaleidoScope_QuadTextureIA8(POLY_KAL_DISP, sPromptChoiceTexs[gSaveContext.language][1], 48, 16, 16); KaleidoScope_QuadTextureIA8(POLY_KAL_DISP, sPromptChoiceTexs[gSaveContext.language][1], 48, 16, 16);
} else if (((pauseCtx->state == 7 && pauseCtx->unk_1EC >= 4) || pauseCtx->state == 0xF) &&
!CVar_GetS32("gSkipSaveConfirmation", 0)) {
POLY_KAL_DISP =
KaleidoScope_QuadTextureIA8(POLY_KAL_DISP, sSaveConfirmationTexs[gSaveContext.language], 152, 16, 0);
} else if ((pauseCtx->state != 7) || (pauseCtx->unk_1EC < 4)) { } else if ((pauseCtx->state != 7) || (pauseCtx->unk_1EC < 4)) {
if ((pauseCtx->state != 0xF) && ((pauseCtx->state == 0x10) || (pauseCtx->state == 0x11))) { if ((pauseCtx->state != 0xF) && ((pauseCtx->state == 0x10) || (pauseCtx->state == 0x11))) {
POLY_KAL_DISP = POLY_KAL_DISP =
@ -3874,7 +3878,7 @@ void KaleidoScope_Update(GlobalContext* globalCtx)
&D_801333E8); &D_801333E8);
Gameplay_PerformSave(globalCtx); Gameplay_PerformSave(globalCtx);
pauseCtx->unk_1EC = 4; pauseCtx->unk_1EC = 4;
D_8082B25C = 3; D_8082B25C = CVar_GetS32("gSkipSaveConfirmation", 0) ? 3 /* 0.1 sec */ : 90 /* 3 secs */;
} }
} else if (CHECK_BTN_ALL(input->press.button, BTN_START) || } else if (CHECK_BTN_ALL(input->press.button, BTN_START) ||
CHECK_BTN_ALL(input->press.button, BTN_B)) { CHECK_BTN_ALL(input->press.button, BTN_B)) {
@ -4118,7 +4122,7 @@ void KaleidoScope_Update(GlobalContext* globalCtx)
gSaveContext.savedSceneNum = globalCtx->sceneNum; gSaveContext.savedSceneNum = globalCtx->sceneNum;
Save_SaveFile(); Save_SaveFile();
pauseCtx->state = 0xF; pauseCtx->state = 0xF;
D_8082B25C = 3; D_8082B25C = CVar_GetS32("gSkipSaveConfirmation", 0) ? 3 /* 0.1 sec */ : 90 /* 3 secs */;
} }
} }
break; break;