From 5b4ce496888a85fd59d0439cea5e9d65b861fecf Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Tue, 6 Sep 2022 15:59:09 -0500
Subject: [PATCH] Base whats in the bazaar shop on entranceIndex instead of age

---
 soh/soh/Enhancements/randomizer/randomizer.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 3a70e8866..7288848a9 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -2634,7 +2634,8 @@ ShopItemIdentity Randomizer::IdentifyShopItem(s32 sceneNum, u8 slotIndex) {
 
     switch (sceneNum) {
         case SCENE_SHOP1:
-            if (LINK_IS_ADULT) {
+            // Bazaar (SHOP1) scene is reused, so use entranceIndex to determine if we're entering from KaK or market
+            if (gSaveContext.entranceIndex == 0xB7) {
                 switch (slotIndex) {
                     case 0:
                         shopItemIdentity.randomizerInf = RAND_INF_SHOP_ITEMS_KAK_BAZAAR_ITEM_1;