github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-21 05:43:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't jail from TH in mixed gerudo entrance shuffle

Browse source
This commit is contained in:
Demur Rumed 2025-07-03 05:01:55 +00:00
commit 75a50d5eed
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
soh/soh/Enhancements/randomizer/randomizer_entrance.c
View file

@ -674,6 +674,11 @@ void Entrance_OverrideWeatherState() {
// instead of being thrown in the valley Child should always be thrown in the stream when caught in the valley, and // instead of being thrown in the valley Child should always be thrown in the stream when caught in the valley, and
// placed at the fortress entrance from valley when caught in the fortress // placed at the fortress entrance from valley when caught in the fortress
void Entrance_OverrideGerudoGuardCapture(void) { void Entrance_OverrideGerudoGuardCapture(void) {
if (gPlayState->sceneNum == SCENE_THIEVES_HIDEOUT &&
Randomizer_GetSettingValue(RSK_MIX_GERUDO_FORTRESS_ENTRANCES)) {
// If GF entrances in mixed shuffle, TH captures stay in TH
gPlayState->nextEntranceIndex = gSaveContext.entranceIndex;
} else {
if (LINK_IS_CHILD) { if (LINK_IS_CHILD) {
gPlayState->nextEntranceIndex = ENTR_GERUDO_VALLEY_1; // Gerudo Valley thrown out gPlayState->nextEntranceIndex = ENTR_GERUDO_VALLEY_1; // Gerudo Valley thrown out
} }
@ -684,6 +689,7 @@ void Entrance_OverrideGerudoGuardCapture(void) {
gPlayState->nextEntranceIndex = ENTR_GERUDOS_FORTRESS_EAST_EXIT; // Gerudo Fortress gPlayState->nextEntranceIndex = ENTR_GERUDOS_FORTRESS_EAST_EXIT; // Gerudo Fortress
} }
} }
}
} }
void Entrance_OverrideSpawnScene(s32 sceneNum, s32 spawn) { void Entrance_OverrideSpawnScene(s32 sceneNum, s32 spawn) {