fix HasSage

HarbourMasters · Feb 16, 2025 · 846f0b6 · 846f0b6
1 parent 439769f
commit 846f0b6
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp
@@ -503,7 +503,7 @@ namespace Rando {
     }
 
     bool Logic::HasSage(RandomizerGet itemName) {
-        return ctx->GetOption(RSK_SHUFFLE_NPC_SOULS).Is(RO_NPC_SOULS_ON_PLUS_SAGES) && HasItem(itemName);
+        return !ctx->GetOption(RSK_SHUFFLE_NPC_SOULS).Is(RO_NPC_SOULS_ON_PLUS_SAGES) || HasItem(itemName);
     }
 
     bool Logic::CanOpenOverworldDoor(RandomizerGet key) {
@@ -782,7 +782,7 @@ namespace Rando {
                 // sticks are limited and using a bottle might become a requirement in that case
                 return HasSoul(RG_GANON_SOUL) && CanUse(RG_LIGHT_ARROWS) && (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD));
             case RE_GANON:
-                return HasSoul(RG_GANON_SOUL) && CanUse(RG_MASTER_SWORD);
+                return HasSoul(RG_GANON_SOUL) && HasSage(RG_ZELDA_SOUL) && CanUse(RG_MASTER_SWORD);
             case RE_DARK_LINK:
             //RANDOTODO Dark link is buggy right now, retest when he is not
                 return CanJumpslash() || CanUse(RG_FAIRY_BOW);
@@ -1463,7 +1463,7 @@ namespace Rando {
         { RG_IMPA_SOUL,              RAND_INF_IMPA_SOUL },
         { RG_ZELDA_SOUL,             RAND_INF_ZELDA_SOUL },
         { RG_BEGGAR_SOUL,            RAND_INF_BEGGAR_SOUL },
-        { RG_DOG_LADY_SOUL,        RAND_INF_DOG_LADY_SOUL },
+        { RG_DOG_LADY_SOUL,          RAND_INF_DOG_LADY_SOUL },
         { RG_ARMS_DEALER_SOUL,       RAND_INF_ARMS_DEALER_SOUL },
         { RG_BEAN_SALESMAN_SOUL,     RAND_INF_BEAN_SALESMAN_SOUL },
         { RG_SHOOTING_SOUL,          RAND_INF_SHOOTING_SOUL },