diff options
| author | briaguya <briaguya@alice> | 2022-12-06 21:29:27 -0500 |
|---|---|---|
| committer | briaguya <briaguya@alice> | 2022-12-06 21:29:27 -0500 |
| commit | 4f109178ffdebbf4824a32ff9b8b9fa0159cf3ce (patch) | |
| tree | e1d17ce453354147e1fc6cbc60cd62e9f78b699c /soh/src/code | |
| parent | d9f3844b2db80f74fc233391164981cf0b59f1f7 (diff) | |
| parent | 00cbd347b2ae8c50dfca1336e9eb7ff45a506784 (diff) | |
Merge branch 'develop-flynn' into flynn-to-dev
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/z_parameter.c | 9 | ||||
| -rw-r--r-- | soh/src/code/z_play.c | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index 1d4e59f07..537d185bd 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -2704,7 +2704,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)) { @@ -2745,6 +2745,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; diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c index b08f9cee4..dab5411b9 100644 --- a/soh/src/code/z_play.c +++ b/soh/src/code/z_play.c @@ -870,7 +870,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); } } |