Skip to content

Fix: Goron City Doors after Fire Temple #5950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stratomaster64 wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Fix: Goron City Doors after Fire Temple #5950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7104040
Fix for edge case with GC doors
stratomaster64 Nov 10, 2025
9fab5ca
clang
stratomaster64 Nov 10, 2025
34fd317
cling
stratomaster64 Nov 10, 2025
1226215
whitespace
serprex Dec 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions soh/soh/Enhancements/Fixes/GoronCityDoorFix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
#include "soh/ShipInit.hpp"

extern "C" {
#include "functions.h"
#include "macros.h"
#include "z64save.h"
#include "src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.h"
}

static constexpr int32_t CVAR_GC_DOOR_FIX_DEFAULT = 0;
#define CVAR_GC_DOOR_FIX_NAME CVAR_ENHANCEMENT("GCDoorsAfterFireFix")
#define CVAR_GC_DOOR_FIX_VALUE CVarGetInteger(CVAR_GC_DOOR_FIX_NAME, CVAR_GC_DOOR_FIX_DEFAULT)

static void OnInitGCDoor(void* refActor) {
// In the off chance that Fire Temple is completed before stopping Goron Link and getting
// Goron Tunic / opening the city doors, open them the next time Link goes to Goron City.
// RefActor is needed since shutter checks inf flag during init.
BgSpot18Shutter* shutter = reinterpret_cast<BgSpot18Shutter*>(refActor);
if (GameInteractor_Should(VB_GORONS_CONSIDER_FIRE_TEMPLE_FINISHED, CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) &&
!Flags_GetInfTable(INFTABLE_GORON_CITY_DOORS_UNLOCKED)) {
Flags_SetInfTable(INFTABLE_GORON_CITY_DOORS_UNLOCKED);
}
}

void RegisterGoronTunicFix() {
COND_ID_HOOK(OnActorInit, ACTOR_BG_SPOT18_SHUTTER, CVAR_GC_DOOR_FIX_VALUE, OnInitGCDoor);
}

static RegisterShipInitFunc initFunc(RegisterGoronTunicFix, { CVAR_GC_DOOR_FIX_NAME });
5 changes: 5 additions & 0 deletions soh/soh/SohGui/SohMenuEnhancements.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -980,6 +980,11 @@ void SohMenu::AddMenuEnhancements() {
.CVar(CVAR_ENHANCEMENT("AnubisFix"))
.Options(CheckboxOptions().Tooltip(
"Make Anubis Fireballs do Fire damage when reflected back at them with the Mirror Shield."));
AddWidget(path, "Fix Goron City Doors After Fire Temple", WIDGET_CVAR_CHECKBOX)
.CVar(CVAR_ENHANCEMENT("GCDoorsAfterFireFix"))
.Options(CheckboxOptions().Tooltip(
"Forces Goron City doors open if you somehow complete Fire Temple without talking to Goron Link "
" and receiving the Goron Tunic."));

AddWidget(path, "Item-related Fixes", WIDGET_SEPARATOR_TEXT);
AddWidget(path, "Fix Deku Nut Upgrade", WIDGET_CVAR_CHECKBOX)
Expand Down
Loading