From fc172dd593527731bd8199030c3dbca7d775979a Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Sun, 4 May 2025 09:31:36 -0500
Subject: [PATCH] Fixed issue with item pool placing items on Zelda Drop Off

---
 ItemList.py | 8 --------
 Regions.py  | 6 +++---
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/ItemList.py b/ItemList.py
index e690d83a..de36b74a 100644
--- a/ItemList.py
+++ b/ItemList.py
@@ -272,14 +272,6 @@ def generate_itempool(world, player):
             item = None
         set_event_item(world, player, loc, item)
 
-    zelda_pickup, zelda_dropoff = None, None
-    if world.mode[player] == 'standard':
-        if not world.shuffle_followers[player]:
-            zelda_pickup = 'Zelda Herself'
-        zelda_dropoff = 'Zelda Delivered'
-    set_event_item(world, player, 'Zelda Pickup', zelda_pickup)
-    set_event_item(world, player, 'Zelda Drop Off', zelda_dropoff)
-
     # set up item pool
     skip_pool_adjustments = False
     if world.customizer and world.customizer.get_item_pool() and player in world.customizer.get_item_pool():
diff --git a/Regions.py b/Regions.py
index 6b276d8f..d634fbb8 100644
--- a/Regions.py
+++ b/Regions.py
@@ -1249,7 +1249,7 @@ def adjust_locations(world, player):
             location.prize = prize_on_boss
             location.real = not prize_on_boss
     # unreal events:
-    for l in ['Ganon', 'Zelda Pickup', 'Zelda Drop Off'] + list(location_events):
+    for l in ['Ganon'] + list(location_events):
         location = world.get_location_unsafe(l, player)
         if location:
             location.type = LocationType.Logical
@@ -1436,8 +1436,8 @@ location_events = {
     'Revealing Light': 'Maiden Unmasked',
     'Ice Block Drop': 'Convenient Block',
     'Skull Star Tile': 'Hidden Pits',
-    'Zelda Pickup': None,
-    'Zelda Drop Off': None
+    'Zelda Pickup': 'Zelda Herself',
+    'Zelda Drop Off': 'Zelda Delivered'
 }