mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-07 02:40:30 -05:00
Code Issues Projects Releases Wiki Activity

fix lab dive check with eye drops (#2119)

Browse Source
This commit is contained in:
Adam Bird 2022-12-10 15:28:11 -05:00 committed by GitHub
parent c1e0db336d
commit 875b9aaff8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c
View File

@ -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 {