Merge pull request #1382 from leggettc18/leggettc18/issue1365

Fixes Ganon's Castle Crash and Trials coming from old save file

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;

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]);