From 9611d0757c66acf1a671feb7439af856c3bd79fd Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Sun, 18 Jul 2021 21:55:27 -0500
Subject: [PATCH] Removed possibility to not remove flute spot from pool when
 chosen

---
 OverworldShuffle.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/OverworldShuffle.py b/OverworldShuffle.py
index accba4a3..d9a9efeb 100644
--- a/OverworldShuffle.py
+++ b/OverworldShuffle.py
@@ -229,7 +229,7 @@ def link_overworld(world, player):
         new_spots = list()
         ignored_regions = set()
 
-        def addSpot(owid, removeFromPool = False):
+        def addSpot(owid):
             if world.owFluteShuffle[player] == 'balanced':
                 def getIgnored(regionname, base_owid, owid):
                     region = world.get_region(regionname, player)
@@ -252,18 +252,17 @@ def link_overworld(world, player):
                 if random.randint(0, 31) != 0 and new_ignored.intersection(ignored_regions):
                     return False
                 ignored_regions.update(new_ignored)
-            if removeFromPool:
-                flute_pool.remove(owid)
+            flute_pool.remove(owid)
             new_spots.append(owid)
             return True
 
         # guarantee desert/mire access
-        addSpot(0x38, True)
+        addSpot(0x38)
 
         # guarantee mountain access
         if world.owShuffle[player] == 'vanilla':
             mountainIds = [0x0b, 0x0e, 0x07]
-            addSpot(mountainIds[random.randint(0, 2)], True)
+            addSpot(mountainIds[random.randint(0, 2)])
 
         random.shuffle(flute_pool)
         f = 0