From 0aab836d1f80407ffa09967d7594a02b5d918d88 Mon Sep 17 00:00:00 2001 From: Adam Bird Date: Fri, 27 Jan 2023 18:36:38 -0500 Subject: [PATCH] Fix: Override jail capture for the Gerudo fighter (#2413) * handle overriding gerudo capture for the fighter * add entrance include --- soh/soh/Enhancements/randomizer/randomizer_entrance.c | 2 +- soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/soh/soh/Enhancements/randomizer/randomizer_entrance.c b/soh/soh/Enhancements/randomizer/randomizer_entrance.c index 03b663b8c..d0f96d375 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_entrance.c +++ b/soh/soh/Enhancements/randomizer/randomizer_entrance.c @@ -659,7 +659,7 @@ void Entrance_OverrideWeatherState() { // 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 void Entrance_OverrideGeurdoGuardCapture(void) { if (LINK_IS_CHILD) { - gPlayState->nextEntranceIndex = 0x1A5; + gPlayState->nextEntranceIndex = 0x1A5; // Geurdo Valley thrown out } if ((LINK_IS_CHILD || Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_ENTRANCES)) && diff --git a/soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c b/soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c index a5782788b..909aa91b4 100644 --- a/soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c +++ b/soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c @@ -6,6 +6,7 @@ #include "z_en_geldb.h" #include "objects/object_geldb/object_geldb.h" +#include "soh/Enhancements/randomizer/randomizer_entrance.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4) @@ -1570,6 +1571,11 @@ void EnGeldB_Draw(Actor* thisx, PlayState* play) { } else { play->nextEntranceIndex = 0x3B4; } + + if (gSaveContext.n64ddFlag) { + Entrance_OverrideGeurdoGuardCapture(); + } + play->fadeTransition = 0x26; play->sceneLoadFlag = 0x14; }