From 2d27665369b226c1630ff7e0c2652eed7bfb4553 Mon Sep 17 00:00:00 2001
From: espeon65536 <espeon65536@gmail.com>
Date: Fri, 10 Sep 2021 00:32:44 -0500
Subject: [PATCH] Fix shop items having inconsistent save context information,
 causing shops to not be sent correctly if fewer than 4 items in any shop

---
 worlds/oot/Patches.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/worlds/oot/Patches.py b/worlds/oot/Patches.py
index 1a27ab02..8144af1b 100644
--- a/worlds/oot/Patches.py
+++ b/worlds/oot/Patches.py
@@ -2125,6 +2125,7 @@ def place_shop_items(rom, world, shop_items, messages, locations, init_shop_id=F
             update_message_by_id(messages, shop_item.description_message, description_text, 0x03)
             update_message_by_id(messages, shop_item.purchase_message, purchase_text, 0x03)
 
+        if any(filter(lambda c: c in location.name, {'5', '6', '7', '8'})):
             world.current_shop_id += 1
 
     return shop_objs