From 7306f35027206341b7b9f3a24983f2edc79d920f Mon Sep 17 00:00:00 2001 From: JordanLongstaff Date: Tue, 29 Apr 2025 20:23:02 -0400 Subject: [PATCH] More format-compliant comment --- .../Enhancements/timesaver_hook_handlers.cpp | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp index 196bc1832..cffa70643 100644 --- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp +++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp @@ -218,23 +218,23 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li (entranceFlag != EVENTCHKINF_EPONA_OBTAINED) && entranceIndex != ENTR_SPIRIT_TEMPLE_BOSS_ENTRANCE) { *should = false; - // Ganon's Tower barrier dispulsion happens in an entrance cutscene, so its side effects must be accounted for + // Check for dispulsion of Ganon's Tower barrier switch (entranceIndex) { - case ENTR_INSIDE_GANONS_CASTLE_2: - case ENTR_INSIDE_GANONS_CASTLE_3: - case ENTR_INSIDE_GANONS_CASTLE_4: - case ENTR_INSIDE_GANONS_CASTLE_5: - case ENTR_INSIDE_GANONS_CASTLE_6: - case ENTR_INSIDE_GANONS_CASTLE_7: - if (Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_FOREST_TRIAL) && - Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_WATER_TRIAL) && - Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_SHADOW_TRIAL) && - Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_FIRE_TRIAL) && - Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_LIGHT_TRIAL) && - Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_SPIRIT_TRIAL)) { - Flags_SetEventChkInf(EVENTCHKINF_DISPELLED_GANONS_TOWER_BARRIER); - } - break; + case ENTR_INSIDE_GANONS_CASTLE_2: + case ENTR_INSIDE_GANONS_CASTLE_3: + case ENTR_INSIDE_GANONS_CASTLE_4: + case ENTR_INSIDE_GANONS_CASTLE_5: + case ENTR_INSIDE_GANONS_CASTLE_6: + case ENTR_INSIDE_GANONS_CASTLE_7: + if (Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_FOREST_TRIAL) && + Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_WATER_TRIAL) && + Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_SHADOW_TRIAL) && + Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_FIRE_TRIAL) && + Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_LIGHT_TRIAL) && + Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_SPIRIT_TRIAL)) { + Flags_SetEventChkInf(EVENTCHKINF_DISPELLED_GANONS_TOWER_BARRIER); + } + break; } } break;