mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-06-29 11:51:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Sync's Ganons Trials and Fixes Softlock (#6828)

Browse Source 
Previous co op softlock fix introduced a possible trial softlock making barrier never dissappear. This not only ensures that softlock cant happen, it syncs the trial flags in real time and allows all cutscenes to finish playing to properly remove the barrier even if the beams are physically visible in your game.
This commit is contained in:
Amber Burton
2026-06-29 00:48:27 -04:00
committed by GitHub
parent a629af2e9f
commit aedddc21e9
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/soh/Network/Anchor/Packets/UpdateTeamState.cpp
+5
View File
@@ -199,6 +199,11 @@ void Anchor::HandlePacket_UpdateTeamState(nlohmann::json payload) {
gSaveContext.ship.stats.firstInput = loadedData.ship.stats.firstInput;
gSaveContext.ship.stats.fileCreatedAt = loadedData.ship.stats.fileCreatedAt;
// Ensure ganon barrier state matches trials
if (gSaveContext.eventChkInf[10] & 0x2000 && gSaveContext.eventChkInf[11] & 0xFC00) {
gSaveContext.eventChkInf[12] |= 0x8;
}
// Restore master sword state
// Disabling this for now, not really sure I understand why I did this in the past
// u8 hasMasterSword = CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, 1);
soh/src/code/z_demo.c
+12
View File
@@ -1229,31 +1229,43 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB
play->nextEntranceIndex = ENTR_INSIDE_GANONS_CASTLE_2;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_FADE_BLACK;
Flags_SetEventChkInf(EVENTCHKINF_COMPLETED_FOREST_TRIAL);
gSaveContext.eventChkInf[11] &= ~0x800;
break;
case 108:
play->nextEntranceIndex = ENTR_INSIDE_GANONS_CASTLE_3;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_FADE_BLACK;
Flags_SetEventChkInf(EVENTCHKINF_COMPLETED_WATER_TRIAL);
gSaveContext.eventChkInf[11] &= ~0x1000;
break;
case 109:
play->nextEntranceIndex = ENTR_INSIDE_GANONS_CASTLE_4;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_FADE_BLACK;
Flags_SetEventChkInf(EVENTCHKINF_COMPLETED_SHADOW_TRIAL);
gSaveContext.eventChkInf[11] &= ~0x2000;
break;
case 110:
play->nextEntranceIndex = ENTR_INSIDE_GANONS_CASTLE_5;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_FADE_BLACK;
Flags_SetEventChkInf(EVENTCHKINF_COMPLETED_FIRE_TRIAL);
gSaveContext.eventChkInf[11] &= ~0x4000;
break;
case 111:
play->nextEntranceIndex = ENTR_INSIDE_GANONS_CASTLE_6;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_FADE_BLACK;
Flags_SetEventChkInf(EVENTCHKINF_COMPLETED_LIGHT_TRIAL);
gSaveContext.eventChkInf[11] &= ~0x8000;
break;
case 112:
play->nextEntranceIndex = ENTR_INSIDE_GANONS_CASTLE_7;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_FADE_BLACK;
Flags_SetEventChkInf(EVENTCHKINF_COMPLETED_SPIRIT_TRIAL);
gSaveContext.eventChkInf[10] &= ~0x2000;
break;
case 113:
if (Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_FOREST_TRIAL) &&