Merge branch 'HarbourMasters:develop-blair' into develop-blair

This commit is contained in:
Extloga 2025-04-07 22:13:49 +02:00 committed by GitHub
commit 54c4aef459
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -404,9 +404,9 @@ void Entrance_SetSavewarpEntrance(void) {
gSaveContext.entranceIndex = ENTR_ICE_CAVERN_ENTRANCE;
} else if (scene == SCENE_INSIDE_GANONS_CASTLE) {
gSaveContext.entranceIndex = ENTR_INSIDE_GANONS_CASTLE_ENTRANCE;
} else if (scene == SCENE_GANONS_TOWER || scene == SCENE_INSIDE_GANONS_CASTLE_COLLAPSE ||
scene == SCENE_GANONS_TOWER_COLLAPSE_INTERIOR || scene == SCENE_GANON_BOSS ||
scene == SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR) {
} else if (scene == SCENE_GANONS_TOWER || scene == SCENE_GANONDORF_BOSS ||
scene == SCENE_INSIDE_GANONS_CASTLE_COLLAPSE || scene == SCENE_GANONS_TOWER_COLLAPSE_INTERIOR ||
scene == SCENE_GANON_BOSS || scene == SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR) {
gSaveContext.entranceIndex = ENTR_GANONS_TOWER_0; // Inside Ganon's Castle -> Ganon's Tower Climb
} else if (scene == SCENE_THIEVES_HIDEOUT) { // Theives hideout
gSaveContext.entranceIndex = ENTR_THIEVES_HIDEOUT_0; // Gerudo Fortress -> Thieve's Hideout spawn 0