From 39b80137f68e060f8e47ef59e94dabd51f0a825b Mon Sep 17 00:00:00 2001
From: Josh Bodner <30329717+jbodner09@users.noreply.github.com>
Date: Sun, 4 Dec 2022 17:13:29 -0800
Subject: Don't autosave in the Chamber of Sages (#2076)

---
 soh/src/code/z_parameter.c | 2 +-
 soh/src/code/z_play.c      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'soh/src/code')

diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
index 0c3afc651..37bf19e09 100644
--- a/soh/src/code/z_parameter.c
+++ b/soh/src/code/z_parameter.c
@@ -2632,7 +2632,7 @@ u8 Item_CheckObtainability(u8 item) {
 }
 
 void PerformAutosave(PlayState* play, u8 item) {
-    if (CVar_GetS32("gAutosave", 0)) {
+    if (CVar_GetS32("gAutosave", 0) && (play->sceneNum != SCENE_KENJYANOMA)) {
         if (CVar_GetS32("gAutosaveAllItems", 0)) {
             Play_PerformSave(play);
         } else if (CVar_GetS32("gAutosaveMajorItems", 1)) {
diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c
index 0203c7ca2..c34c98f44 100644
--- a/soh/src/code/z_play.c
+++ b/soh/src/code/z_play.c
@@ -852,7 +852,7 @@ void Play_Update(PlayState* play) {
                             // Don't autosave in grottos or cutscenes
                             // Also don't save when you first load a file
                             if (CVar_GetS32("gAutosave", 0) && (gSaveContext.cutsceneIndex == 0) && (play->gameplayFrames > 60) &&
-                                (play->sceneNum != SCENE_YOUSEI_IZUMI_TATE) && (play->sceneNum != SCENE_KAKUSIANA)) {
+                                (play->sceneNum != SCENE_YOUSEI_IZUMI_TATE) && (play->sceneNum != SCENE_KAKUSIANA) && (play->sceneNum != SCENE_KENJYANOMA)) {
                                 Play_PerformSave(play);
                             }
                         }
-- 
cgit v1.2.3


From 656dcd2021a7e3ac0f4f0f2a353aa54c81cc7878 Mon Sep 17 00:00:00 2001
From: Josh Bodner <30329717+jbodner09@users.noreply.github.com>
Date: Sun, 4 Dec 2022 17:54:23 -0800
Subject: Don't autosave after obtaining bombchus if bombchu drops are enabled
 (#2077)

---
 soh/src/code/z_parameter.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'soh/src/code')

diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
index 37bf19e09..32ae18ab5 100644
--- a/soh/src/code/z_parameter.c
+++ b/soh/src/code/z_parameter.c
@@ -2673,6 +2673,13 @@ void PerformAutosave(PlayState* play, u8 item) {
                     if (play->sceneNum == SCENE_GANON_DEMO) {
                         break;
                     }
+                case ITEM_BOMBCHU:
+                case ITEM_BOMBCHUS_5:
+                case ITEM_BOMBCHUS_20:
+                    if (!CVar_GetS32("gBombchuDrops", 0)) {
+                        Play_PerformSave(play);
+                    }
+                    break;
                 default:
                     Play_PerformSave(play);
                     break;
-- 
cgit v1.2.3