diff options
| author | Christopher Leggett <chris@leggett.dev> | 2023-12-18 17:31:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-18 17:31:17 -0500 |
| commit | 4978c3b34fbe820b47f36210b0c54f76d0bfccba (patch) | |
| tree | 3d3877f05d4b2d1da12a605189e1ef37b7a993f6 /soh/src/code | |
| parent | 36e030e339ec35c6c3ced1f8c341ac5f88b9c50d (diff) | |
Fix some bugs with settings (#3525)
* Fixes off by one errors for a few settings.
* Removes disable of shuffle options when starting with corresponding items.
* Junks checks when shuffle is off and start with is on.
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/z_parameter.c | 2 | ||||
| -rw-r--r-- | soh/src/code/z_play.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index 67405d226..e9626c068 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -2612,7 +2612,7 @@ u16 Randomizer_Item_Give(PlayState* play, GetItemEntry giEntry) { GameInteractor_SetTriforceHuntPieceGiven(true); // Teleport to credits when goal is reached. - if (gSaveContext.triforcePiecesCollected == Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED)) { + if (gSaveContext.triforcePiecesCollected == (Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED) + 1)) { gSaveContext.sohStats.itemTimestamp[TIMESTAMP_TRIFORCE_COMPLETED] = GAMEPLAYSTAT_TOTAL_TIME; gSaveContext.sohStats.gameComplete = 1; Flags_SetRandomizerInf(RAND_INF_GRANT_GANONS_BOSSKEY); diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c index d6c84e355..f9b3e7cf4 100644 --- a/soh/src/code/z_play.c +++ b/soh/src/code/z_play.c @@ -2362,7 +2362,7 @@ void Play_PerformSave(PlayState* play) { uint8_t triforceHuntCompleted = IS_RANDO && - gSaveContext.triforcePiecesCollected == Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED) && + gSaveContext.triforcePiecesCollected == (Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED) + 1) && Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT); if (CVarGetInteger("gAutosave", AUTOSAVE_OFF) != AUTOSAVE_OFF || triforceHuntCompleted) { Overlay_DisplayText(3.0f, "Game Saved"); |