From dee8b447554da80dcfca2faceaea82b6a468a363 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Andr=C3=A9asson?= <medumee@gmail.com>
Date: Sat, 25 Jan 2025 00:20:09 +0100
Subject: [PATCH] * Fixed market bushes by tree not working at night

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

diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 6bf3e1b87..4a46902a2 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -2199,8 +2199,25 @@ GrassIdentity Randomizer::IdentifyGrass(s32 sceneNum, s32 posX, s32 posZ, s32 re
         // We'll just pretend it's always daytime for our market bushes.
         if (sceneNum == SCENE_MARKET_NIGHT) {
             sceneNum = SCENE_MARKET_DAY;
+
+            /*
+                The two bushes by the tree are not in the same spot
+                between night and day. We'll assume the coordinates
+                of the daytime bushes so that we can count them as
+                the same locations.
+            */
+            if (posX == -74) {
+                posX = -106;
+                posZ = 277;
+            }
+            if (posX == -87) {
+                posX = -131;
+                posZ = 225;
+            }
         }
 
+        // The two bushes behind the sign in KF should be separated
+        // locations between Child and Adult.
         if (sceneNum == SCENE_KOKIRI_FOREST && linkAge == 0) {
             if (posX == -498 || posX == -523) {
                 posZ = 0xFF;