From d67dcb92f2ffd427a9c269f225627a8c59b4a672 Mon Sep 17 00:00:00 2001
From: anthony-barricelli
 <104381450+anthony-barricelli@users.noreply.github.com>
Date: Sat, 14 Feb 2026 20:19:31 -0500
Subject: [PATCH] Bug Fix: Setting Start with OoT only gives Fairy Ocarina in
 Rando (#6227)

---
 soh/soh/Enhancements/randomizer/randomizerTypes.h | 2 +-
 soh/soh/Enhancements/randomizer/savefile.cpp      | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index 366a7525f..9a8b7fe44 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -6941,7 +6941,7 @@ typedef enum {
     RO_SHUFFLE_MERCHANTS_ALL
 } RandoOptionShuffleMerchants;
 
-// Starting Ocarina Settings (off, fairy)
+// Starting Ocarina Settings (off, fairy, oot)
 typedef enum {
     RO_STARTING_OCARINA_OFF,
     RO_STARTING_OCARINA_FAIRY,
diff --git a/soh/soh/Enhancements/randomizer/savefile.cpp b/soh/soh/Enhancements/randomizer/savefile.cpp
index a2522ce5a..064eabff6 100644
--- a/soh/soh/Enhancements/randomizer/savefile.cpp
+++ b/soh/soh/Enhancements/randomizer/savefile.cpp
@@ -162,7 +162,9 @@ void SetStartingItems() {
     }
 
     if (Randomizer_GetSettingValue(RSK_STARTING_OCARINA)) {
-        INV_CONTENT(ITEM_OCARINA_FAIRY) = ITEM_OCARINA_FAIRY;
+        INV_CONTENT(ITEM_OCARINA_FAIRY) = Randomizer_GetSettingValue(RSK_STARTING_OCARINA) == RO_STARTING_OCARINA_FAIRY
+                                              ? ITEM_OCARINA_FAIRY
+                                              : ITEM_OCARINA_TIME;
     }
 
     if (Randomizer_GetSettingValue(RSK_STARTING_STICKS) && !Randomizer_GetSettingValue(RSK_SHUFFLE_DEKU_STICK_BAG)) {