summaryrefslogtreecommitdiff
path: root/mm/2s2h/Rando/ActorBehavior/ObjTree.cpp
diff options
context:
space:
mode:
authorEblo <7004497+Eblo@users.noreply.github.com>2026-04-03 17:21:46 -0400
committerGitHub <noreply@github.com>2026-04-03 17:21:46 -0400
commit20b09fe5bec303586b8cecf39324827729ef615d (patch)
tree775872c4605501a5e8cec99af6e0d8070e610981 /mm/2s2h/Rando/ActorBehavior/ObjTree.cpp
parent71d89aa56870471d9a3460762c51a9efbfa00316 (diff)
Fix mundane shuffles and ice arrows in GBC (#1618)
Diffstat (limited to 'mm/2s2h/Rando/ActorBehavior/ObjTree.cpp')
-rw-r--r--mm/2s2h/Rando/ActorBehavior/ObjTree.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/mm/2s2h/Rando/ActorBehavior/ObjTree.cpp b/mm/2s2h/Rando/ActorBehavior/ObjTree.cpp
index e5fc513d5..acd6de6dc 100644
--- a/mm/2s2h/Rando/ActorBehavior/ObjTree.cpp
+++ b/mm/2s2h/Rando/ActorBehavior/ObjTree.cpp
@@ -31,12 +31,18 @@ std::map<std::tuple<s16, s16, s16>, RandoCheckId> treeActorIdMap = {
{ { SCENE_GORONRACE, 0, 67 }, RC_GORON_RACETRACK_TREE_09 },
{ { SCENE_GORONRACE, 0, 68 }, RC_GORON_RACETRACK_TREE_10 },
- // Great Bay Coast
+ // Great Bay Coast (pre-temple clear)
{ { SCENE_30GYOSON, 0, 10 }, RC_GREAT_BAY_COAST_TREE_01 },
{ { SCENE_30GYOSON, 0, 11 }, RC_GREAT_BAY_COAST_TREE_02 },
{ { SCENE_30GYOSON, 0, 12 }, RC_GREAT_BAY_COAST_TREE_03 },
{ { SCENE_30GYOSON, 0, 13 }, RC_GREAT_BAY_COAST_TREE_04 },
+ // Great Bay Coast (post-temple clear)
+ { { SCENE_30GYOSON, 0, 31 }, RC_GREAT_BAY_COAST_TREE_01 },
+ { { SCENE_30GYOSON, 0, 33 }, RC_GREAT_BAY_COAST_TREE_02 },
+ { { SCENE_30GYOSON, 0, 34 }, RC_GREAT_BAY_COAST_TREE_03 },
+ { { SCENE_30GYOSON, 0, 32 }, RC_GREAT_BAY_COAST_TREE_04 },
+
// Path to Mountain Village
{ { SCENE_13HUBUKINOMITI, 0, 14 }, RC_PATH_TO_MOUNTAIN_VILLAGE_TREE_01 },
{ { SCENE_13HUBUKINOMITI, 0, 15 }, RC_PATH_TO_MOUNTAIN_VILLAGE_TREE_02 },