ihateninjas/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-04-23 08:14:31 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix swimvoid in grottos to just respawn in grotto (#6529)

Browse source
This commit is contained in:
Philip Dubé 2026-04-21 16:02:33 +00:00 committed by GitHub
parent 719bb87eda
commit 69681e608f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
soh/soh/Enhancements/randomizer/hook_handlers.cpp
View file

@ -2616,7 +2616,16 @@ void RandomizerOnPlayerUpdateHandler() {
gSaveContext.respawn[RESPAWN_MODE_DOWN].yaw = respawn->second.yaw;
}
Play_TriggerVoidOut(gPlayState);
if (gPlayState->sceneNum == SCENE_GROTTOS) {
// RESPAWN_MODE_DOWN isn't refreshed on grotto entry, reload grotto instead
gPlayState->nextEntranceIndex = gSaveContext.entranceIndex;
gPlayState->transitionTrigger = TRANS_TRIGGER_START;
gPlayState->transitionType = TRANS_TYPE_FADE_BLACK;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK;
gSaveContext.respawnFlag = 0;
} else {
Play_TriggerVoidOut(gPlayState);
}
}
}