diff options
| author | Adam Bird <Archez@users.noreply.github.com> | 2023-11-04 17:52:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-04 22:52:09 +0100 |
| commit | 44ee6da0aaa640fad8a38bc160a97adeda6a0214 (patch) | |
| tree | 11c8aa807c218ae5b26be787da49ff710667439a /soh/src/code | |
| parent | 25f05e68b3896439684c4bf8493c52489edcdfa9 (diff) | |
fix quest assignment (#3343)
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/z_play.c | 2 | ||||
| -rw-r--r-- | soh/src/code/z_sram.c | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c index 112a71888..bf7016884 100644 --- a/soh/src/code/z_play.c +++ b/soh/src/code/z_play.c @@ -1202,7 +1202,7 @@ void Play_Update(PlayState* play) { play->gameplayFrames++; // Gameplay stat tracking if (!gSaveContext.sohStats.gameComplete && - (!IS_BOSS_RUSH || (IS_BOSS_RUSH && !gSaveContext.isBossRushPaused))) { + (!IS_BOSS_RUSH || !gSaveContext.isBossRushPaused)) { gSaveContext.sohStats.playTimer++; gSaveContext.sohStats.sceneTimer++; gSaveContext.sohStats.roomTimer++; diff --git a/soh/src/code/z_sram.c b/soh/src/code/z_sram.c index 057460b62..1ce20abc3 100644 --- a/soh/src/code/z_sram.c +++ b/soh/src/code/z_sram.c @@ -10,6 +10,8 @@ void Save_LoadFile(void); +void BossRush_InitSave(void); + /** * Initialize new save. * This save has an empty inventory with 3 hearts and single magic. @@ -33,6 +35,7 @@ void Sram_InitDebugSave(void) { void Sram_InitBossRushSave(void) { Save_InitFile(false); + BossRush_InitSave(); } /** @@ -221,11 +224,15 @@ void Sram_InitSave(FileChooseContext* fileChooseCtx) { gSaveContext.n64ddFlag = fileChooseCtx->n64ddFlag; - if (fileChooseCtx->questType[fileChooseCtx->buttonIndex] == QUEST_RANDOMIZER && + u8 currentQuest = fileChooseCtx->questType[fileChooseCtx->buttonIndex]; + + if (currentQuest == QUEST_RANDOMIZER && strnlen(CVarGetString("gSpoilerLog", ""), 1) != 0) { gSaveContext.questId = QUEST_RANDOMIZER; Randomizer_InitSaveFile(); + } else if (currentQuest == QUEST_MASTER) { + gSaveContext.questId = QUEST_MASTER; } Save_SaveFile(); |