Rando - Ganon & Ganondorf cutscene skips (#2321)

* Ganon(dorf) cutscene skips

* Remove leftover code

* Comment out the Ganondorf dying cutscene skip
This commit is contained in:
aMannus 2023-01-21 13:55:53 +01:00 committed by GitHub
commit 4291ec8252
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 253 additions and 197 deletions

View file

@ -2180,9 +2180,8 @@ void Cutscene_HandleConditionalTriggers(PlayState* play) {
gEntranceTable[((void)0, gSaveContext.entranceIndex)].scene == SCENE_GANON_FINAL)) {
Flags_SetEventChkInf(0xC7);
gSaveContext.entranceIndex = 0x0517;
// If we are rando and tower escape skip is on, then set the flag to say we saw the towers fall
// and exit.
if (bShouldTowerRandoSkip) {
// In rando, skip the cutscene for the tower falling down after the escape.
if (gSaveContext.n64ddFlag) {
return;
}
gSaveContext.cutsceneIndex = 0xFFF0;