From 00a862a252cb1c0e0cb3e37beec4f42010ff54a5 Mon Sep 17 00:00:00 2001 From: briaguya <70942617+briaguya-ai@users.noreply.github.com> Date: Tue, 29 Nov 2022 22:43:05 -0500 Subject: use trial enum instead of magic numbers (#2039) * use trial enum instead of magic numbers * simplify trial count/random trial logic * set default to set number Co-authored-by: briaguya --- soh/src/code/z_sram.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'soh/src/code') diff --git a/soh/src/code/z_sram.c b/soh/src/code/z_sram.c index 5fb913083..7d9d85b68 100644 --- a/soh/src/code/z_sram.c +++ b/soh/src/code/z_sram.c @@ -324,12 +324,10 @@ void Sram_InitSave(FileChooseContext* fileChooseCtx) { gSaveContext.randomizerInf[i] = 0; } - // Set all trials to cleared if trial count is random or anything other than 6 - if (Randomizer_GetSettingValue(RSK_RANDOM_TRIALS) || (Randomizer_GetSettingValue(RSK_TRIAL_COUNT) != 6)) { - for (u16 i = RAND_INF_TRIALS_DONE_LIGHT_TRIAL; i <= RAND_INF_TRIALS_DONE_SHADOW_TRIAL; i++) { - if (!Randomizer_IsTrialRequired(i)) { - Flags_SetRandomizerInf(i); - } + // If any trials aren't required, set them as completed + for (u16 i = RAND_INF_TRIALS_DONE_LIGHT_TRIAL; i <= RAND_INF_TRIALS_DONE_SHADOW_TRIAL; i++) { + if (!Randomizer_IsTrialRequired(i)) { + Flags_SetRandomizerInf(i); } } -- cgit v1.2.3