From fba8fc2b74607e85567b383361f19f7c79a89396 Mon Sep 17 00:00:00 2001 From: Christopher Leggett Date: Sat, 3 Sep 2022 00:20:07 -0400 Subject: [PATCH 1/2] Fix Ganons Trials coming from old save files. Fixes #1365 --- soh/soh/Enhancements/randomizer/randomizer.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index b8442e2412..cb0ef6e5bc 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -1136,6 +1136,8 @@ void Randomizer::ParseRequiredTrialsFile(const char* spoilerFileName) { return; } + this->trialsRequired.clear(); + try { json spoilerFileJson; spoilerFileStream >> spoilerFileJson; From a07ea091f00adbb817f6f373d1e7204a32924c93 Mon Sep 17 00:00:00 2001 From: Christopher Leggett Date: Sat, 3 Sep 2022 00:20:50 -0400 Subject: [PATCH 2/2] Fixes crash when entering Ganon's Castle lobby on linux. --- soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c b/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c index 6d0b51db23..b2dc185d76 100644 --- a/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c +++ b/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c @@ -88,7 +88,7 @@ s32 DemoKekkai_CheckEventFlag(s32 params) { if ((params < KEKKAI_TOWER) || (params > KEKKAI_FOREST)) { return true; } - if (gSaveContext.n64ddFlag) { + if (gSaveContext.n64ddFlag && params > KEKKAI_TOWER) { return Flags_GetRandomizerInf(trialParamToRandInf(params)); } return Flags_GetEventChkInf(eventFlags[params]);