From e27453007324ea6db73ce4602973bb0fb59856bf Mon Sep 17 00:00:00 2001 From: Garrett Cox Date: Sat, 6 Aug 2022 02:43:10 -0500 Subject: [PATCH] Fix cows giving free bottles, too generous --- soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c index b5e7992e2..36b5d2032 100644 --- a/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -342,7 +342,11 @@ void func_809DF7D8(EnCow* this, GlobalContext* globalCtx) { void func_809DF870(EnCow* this, GlobalContext* globalCtx) { if ((Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(globalCtx)) { - if (Inventory_HasEmptyBottle() || (gSaveContext.n64ddFlag && EnCow_GetRandomizerItem(this, globalCtx) != ITEM_NONE)) { + if (Inventory_HasEmptyBottle() || + (gSaveContext.n64ddFlag && + Randomizer_GetSettingValue(RSK_SHUFFLE_COWS) && + EnCow_GetRandomizerItem(this, globalCtx) != ITEM_NONE) + ) { Message_ContinueTextbox(globalCtx, 0x2007); this->actionFunc = func_809DF7D8; } else {