From 875b9aaff8912b46a38502d6cb1e3167061a859a Mon Sep 17 00:00:00 2001 From: Adam Bird Date: Sat, 10 Dec 2022 15:28:11 -0500 Subject: [PATCH] fix lab dive check with eye drops (#2119) --- soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c index 8fc28530a..7d648a4b7 100644 --- a/soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -251,7 +251,9 @@ void EnMk_Wait(EnMk* this, PlayState* play) { player->actor.textId = this->actor.textId; this->actionFunc = func_80AACA40; } else { - if (INV_CONTENT(ITEM_ODD_MUSHROOM) == ITEM_EYEDROPS) { + // Skip eye drop text on rando if Link went in the water, so you can still receive the dive check + if (INV_CONTENT(ITEM_ODD_MUSHROOM) == ITEM_EYEDROPS && + (!gSaveContext.n64ddFlag || this->swimFlag == 0)) { player->actor.textId = 0x4032; this->actionFunc = func_80AACA40; } else {