From 19df711123f88f5ea1bc7ec68abae20a7118d9f6 Mon Sep 17 00:00:00 2001 From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com> Date: Sat, 21 Feb 2026 17:48:50 +0000 Subject: [PATCH] remove castle moat spawn override (#6284) --- soh/soh/Enhancements/randomizer/randomizer_entrance.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/randomizer_entrance.c b/soh/soh/Enhancements/randomizer/randomizer_entrance.c index 010e40a23..0154cd99f 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_entrance.c +++ b/soh/soh/Enhancements/randomizer/randomizer_entrance.c @@ -701,14 +701,6 @@ void Entrance_OverrideSpawnScene(s32 sceneNum, s32 spawn) { modifiedLinkActorEntry.params = gPlayState->linkActorEntry->params; if (Randomizer_GetSettingValue(RSK_SHUFFLE_DUNGEON_ENTRANCES) == RO_DUNGEON_ENTRANCE_SHUFFLE_ON_PLUS_GANON) { - // Move Hyrule's Castle Courtyard exit spawn to be before the crates so players don't skip Talon - if (sceneNum == SCENE_HYRULE_CASTLE && spawn == 1) { - modifiedLinkActorEntry.pos.x = 0x033A; - modifiedLinkActorEntry.pos.y = 0x0623; - modifiedLinkActorEntry.pos.z = 0xFF22; - gPlayState->linkActorEntry = &modifiedLinkActorEntry; - } - // Move Ganon's Castle exit spawn to be on the small ledge near the castle and not over the void // to prevent Link from falling if the bridge isn't spawned if (sceneNum == SCENE_OUTSIDE_GANONS_CASTLE && spawn == 1) {