From 3dddc63f95f550739fd15a5d3fd182f3862d6620 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Thu, 10 Jul 2025 21:01:18 +0100
Subject: [PATCH] initial changes

---
 OTRExporter                                         | 2 +-
 ZAPDTR                                              | 2 +-
 libultraship                                        | 2 +-
 soh/soh/Enhancements/randomizer/3drando/hints.cpp   | 3 +++
 soh/soh/Enhancements/randomizer/location_access.cpp | 2 ++
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/OTRExporter b/OTRExporter
index 41052efcd..461ab19a3 160000
--- a/OTRExporter
+++ b/OTRExporter
@@ -1 +1 @@
-Subproject commit 41052efcdf8df8e67517cc93da8975fcd4e14af9
+Subproject commit 461ab19a36cde807591543397e136cae19aa6e7c
diff --git a/ZAPDTR b/ZAPDTR
index 2aeababbf..684f21a47 160000
--- a/ZAPDTR
+++ b/ZAPDTR
@@ -1 +1 @@
-Subproject commit 2aeababbfb81b00d34673406453e8e8e2deaa27b
+Subproject commit 684f21a475dcfeee89938ae1f4afc42768a3e7ef
diff --git a/libultraship b/libultraship
index ffc062cbf..6a3f6cd32 160000
--- a/libultraship
+++ b/libultraship
@@ -1 +1 @@
-Subproject commit ffc062cbf44ce8dc07ac9fc0185224010bd78cc5
+Subproject commit 6a3f6cd327b99f617b623e5b9a3afeae460aac2b
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index c38d57d8b..ecda5c697 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -648,6 +648,9 @@ void CreateStoneHints() {
     if (ctx->GetOption(RSK_SKIP_CHILD_ZELDA)) {
         ctx->GetItemLocation(RC_SONG_FROM_IMPA)->SetHintAccesible();
     }
+    if (ctx->GetOption(RSK_SELECTED_STARTING_AGE).Is(RO_AGE_ADULT)){
+        ctx->GetItemLocation(RC_TOT_MASTER_SWORD)->SetHintAccesible();
+    }
 
     // Add 'always' location hints
     std::vector<RandomizerCheck> alwaysHintLocations = {};
diff --git a/soh/soh/Enhancements/randomizer/location_access.cpp b/soh/soh/Enhancements/randomizer/location_access.cpp
index cdd684f04..2b8c3e43c 100644
--- a/soh/soh/Enhancements/randomizer/location_access.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access.cpp
@@ -387,6 +387,8 @@ void RegionTable_Init() {
         LOCATION(RC_LINKS_POCKET,       true),
         LOCATION(RC_TRIFORCE_COMPLETED, logic->GetSaveContext()->ship.quest.data.randomizer.triforcePiecesCollected >= ctx->GetOption(RSK_TRIFORCE_HUNT_PIECES_REQUIRED).Get() + 1;),
         LOCATION(RC_SARIA_SONG_HINT,    logic->CanUse(RG_SARIAS_SONG)),
+        LOCATION(RC_SONG_FROM_IMPA,     (bool)ctx->GetOption(RSK_SKIP_CHILD_ZELDA)),
+        LOCATION(RC_TOT_MASTER_SWORD,   (bool)ctx->GetOption(RSK_SELECTED_STARTING_AGE).Is(RO_AGE_ADULT)),
     }, {
         //Exits
         Entrance(RR_ROOT_EXITS, []{return true;}),