mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-13 13:05:06 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1382 from leggettc18/leggettc18/issue1365

Browse Source 
Fixes Ganon's Castle Crash and Trials coming from old save file
This commit is contained in:
briaguya 2022-09-03 00:43:43 -04:00 committed by GitHub
commit df8f94da70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
soh/soh/Enhancements/randomizer/randomizer.cpp
View File

@ -1136,6 +1136,8 @@ void Randomizer::ParseRequiredTrialsFile(const char* spoilerFileName) {
return;
}
this->trialsRequired.clear();
try {
json spoilerFileJson;
spoilerFileStream >> spoilerFileJson;

2
soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c
View File

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