From 6afd018b6da75ed9666f0f43e678d036ac852829 Mon Sep 17 00:00:00 2001
From: Cameron <105471409+keraion@users.noreply.github.com>
Date: Wed, 6 Aug 2025 07:36:09 -0400
Subject: [PATCH] fix song fairy shuffle locations

---
 soh/soh/Enhancements/randomizer/3drando/item_pool.cpp   | 2 +-
 soh/soh/Enhancements/randomizer/option_descriptions.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
index b3c33ffea..74c0c1523 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -1023,7 +1023,7 @@ void GenerateItemPool() {
 
     // Shuffle Song Fairies
     if (ctx->GetOption(RSK_SHUFFLE_SONG_FAIRIES)) {
-        for (auto rc : Rando::StaticData::GetBeanFairyLocations()) {
+        for (auto rc : Rando::StaticData::GetSongFairyLocations()) {
             AddItemToMainPool(GetJunkItem());
         }
         // 3 Shadow Temple
diff --git a/soh/soh/Enhancements/randomizer/option_descriptions.cpp b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
index 457edc007..5aa318430 100644
--- a/soh/soh/Enhancements/randomizer/option_descriptions.cpp
+++ b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
@@ -476,7 +476,8 @@ void Settings::CreateOptionDescriptions() {
         "Overworld - Only freestanding rupees & hearts that are outside of dungeons.\n"
         "\n"
         "All Items - Shuffle all freestanding rupees & hearts.";
-    mOptionDescriptions[RSK_SHUFFLE_FOUNTAIN_FAIRIES] = "Shuffle fairies in fountain locations.";
+    mOptionDescriptions[RSK_SHUFFLE_FOUNTAIN_FAIRIES] = "Shuffle fairies in fountain locations. "
+        "This includes the sets of fairies found in Ganon's Castle and the Desert Oasis.";
     mOptionDescriptions[RSK_SHUFFLE_STONE_FAIRIES] = "Shuffle fairies from gossip stone locations.";
     mOptionDescriptions[RSK_SHUFFLE_BEAN_FAIRIES] = "Shuffle fairies from magic bean locations.";
     mOptionDescriptions[RSK_SHUFFLE_SONG_FAIRIES] =