From 0f41b2591853e915ebec5b749a2c81d5a44b6cd5 Mon Sep 17 00:00:00 2001
From: inspectredc <78732756+inspectredc@users.noreply.github.com>
Date: Sun, 10 Sep 2023 18:48:17 +0100
Subject: bush drop fix (#3148)

---
 soh/src/code/z_en_item00.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'soh/src/code')

diff --git a/soh/src/code/z_en_item00.c b/soh/src/code/z_en_item00.c
index 22a03ea32..9d2b2dd74 100644
--- a/soh/src/code/z_en_item00.c
+++ b/soh/src/code/z_en_item00.c
@@ -1753,7 +1753,11 @@ void Item_DropCollectibleRandom(PlayState* play, Actor* fromActor, Vec3f* spawnP
                     }
                 }
             } else {
-                Item_DropCollectible(play, spawnPos, params | 0x8000);
+                if (CVarGetInteger("gBushDropFix", 0)) {
+                    Item_DropCollectible(play, spawnPos, dropId | 0x8000);
+                } else {
+                    Item_DropCollectible(play, spawnPos, params | 0x8000);
+                }
             }
             dropQuantity--;
         }
-- 
cgit v1.2.3