From e9354cc9a150a00ba829d2355a2db92d4a527dc0 Mon Sep 17 00:00:00 2001
From: lilDavid <1337lilDavid@gmail.com>
Date: Fri, 12 Aug 2022 17:05:29 -0500
Subject: [PATCH] Don't spawn Fado and the carpenter's son at once

---
 .../randomizer/adult_trade_shuffle.h          |  1 +
 soh/src/code/z_parameter.c                    |  2 +-
 soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c   | 21 ++++++++++++++-----
 soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c   | 15 ++++++++++++-
 4 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/adult_trade_shuffle.h b/soh/soh/Enhancements/randomizer/adult_trade_shuffle.h
index c5199e50a4..d30ca2839a 100644
--- a/soh/soh/Enhancements/randomizer/adult_trade_shuffle.h
+++ b/soh/soh/Enhancements/randomizer/adult_trade_shuffle.h
@@ -4,6 +4,7 @@
 #include <z64.h>
 
 #define ADULT_TRADE_FLAG(itemId) (1 << (itemId - ITEM_POCKET_EGG))
+#define PLAYER_HAS_SHUFFLED_ADULT_TRADE_ITEM(itemID) (gSaveContext.adultTradeItems & ADULT_TRADE_FLAG(itemID))
 
 void Randomizer_ConsumeAdultTradeItem(GlobalContext* globalCtx, u8 itemId);
 u8 Randomizer_GetNextAdultTradeItem();
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
index 73c1bec6c6..e844a9267a 100644
--- a/soh/src/code/z_parameter.c
+++ b/soh/src/code/z_parameter.c
@@ -2578,7 +2578,7 @@ bool Inventory_HatchPocketCucco(GlobalContext* globalCtx) {
         return Inventory_ReplaceItem(globalCtx, ITEM_POCKET_EGG, ITEM_POCKET_CUCCO);
     }
 
-    if (!(gSaveContext.adultTradeItems & ADULT_TRADE_FLAG(ITEM_POCKET_EGG))) { 
+    if (!PLAYER_HAS_SHUFFLED_ADULT_TRADE_ITEM(ITEM_POCKET_EGG)) { 
          return 0;
     }
 
diff --git a/soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c
index 3fe2c98516..b3c008a506 100644
--- a/soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c
+++ b/soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c
@@ -79,14 +79,25 @@ void EnHs_Init(Actor* thisx, GlobalContext* globalCtx) {
         // "chicken shop (adult era)"
         osSyncPrintf(VT_FGCOL(CYAN) " ヒヨコの店(大人の時) \n" VT_RST);
         func_80A6E3A0(this, func_80A6E9AC);
-        bool shouldDespawn;
+        bool shouldSpawn;
         bool tradedMushroom = gSaveContext.itemGetInf[3] & 1;
-        if (gSaveContext.n64ddFlag) {
-            shouldDespawn = tradedMushroom && !(gSaveContext.adultTradeItems & ADULT_TRADE_FLAG(ITEM_COJIRO));
+        if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_SHUFFLE_ADULT_TRADE)) {
+            // To explain the logic because Fado and Grog are linked:
+            // - If you have Cojiro, then spawn Grog and not Fado.
+            // - If you don't have Cojiro but do have Odd Potion, spawn Fado and not Grog.
+            // - If you don't have either, spawn Grog if you haven't traded the Odd Mushroom.
+            // - If you don't have either but have traded the mushroom, don't spawn either.
+            if (PLAYER_HAS_SHUFFLED_ADULT_TRADE_ITEM(ITEM_COJIRO)) {
+                shouldSpawn = true;
+            } else if (PLAYER_HAS_SHUFFLED_ADULT_TRADE_ITEM(ITEM_ODD_POTION)) {
+                shouldSpawn = false;
+            } else {
+                shouldSpawn = !tradedMushroom;
+            }
         } else {
-            shouldDespawn = tradedMushroom;
+            shouldSpawn = !tradedMushroom;
         }
-        if (shouldDespawn) {
+        if (!shouldSpawn) {
             // "chicken shop closed"
             osSyncPrintf(VT_FGCOL(CYAN) " ヒヨコ屋閉店 \n" VT_RST);
             Actor_Kill(&this->actor);
diff --git a/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c b/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c
index 4b9bc1f2b3..2763be7348 100644
--- a/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c
+++ b/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c
@@ -1026,7 +1026,20 @@ s32 EnKo_CanSpawn(EnKo* this, GlobalContext* globalCtx) {
             }
 
         case SCENE_SPOT10:
-            return (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_ODD_POTION) ? true : false;
+            if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_SHUFFLE_ADULT_TRADE)) {
+                // To explain the logic because Fado and Grog are linked:
+                // - If you have Cojiro, then spawn Grog and not Fado.
+                // - If you don't have Cojiro but do have Odd Potion, spawn Fado and not Grog.
+                // - If you don't have either, spawn Grog if you haven't traded the Odd Mushroom.
+                // - If you don't have either but have traded the mushroom, don't spawn either.
+                if (PLAYER_HAS_SHUFFLED_ADULT_TRADE_ITEM(ITEM_COJIRO)) {
+                    return false;
+                } else {
+                    return PLAYER_HAS_SHUFFLED_ADULT_TRADE_ITEM(ITEM_ODD_POTION);
+                }
+            } else {
+                return (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_ODD_POTION) ? true : false;
+            }
         default:
             return false;
     }