From a61d7720ad3520c9b6ca8096686e9ffa58adc26d Mon Sep 17 00:00:00 2001 From: briaguya Date: Wed, 1 Jun 2022 02:48:01 -0400 Subject: [PATCH 1/2] lab dive --- soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 e0798da82..9e5c1fc84 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 @@ -197,14 +197,14 @@ void func_80AACFA0(EnMk* this, GlobalContext* globalCtx) { this->actionFunc = func_80AACA40; gSaveContext.itemGetInf[1] |= 1; } else { - func_8002F434(&this->actor, globalCtx, GI_HEART_PIECE, 10000.0f, 50.0f); + func_8002F434(&this->actor, globalCtx, gSaveContext.n64ddFlag ? GetRandomizedItemIdFromKnownCheck(LH_LAB_DIVE, GI_HEART_PIECE) : GI_HEART_PIECE, 10000.0f, 50.0f); } } void func_80AAD014(EnMk* this, GlobalContext* globalCtx) { if (Actor_TextboxIsClosing(&this->actor, globalCtx)) { this->actionFunc = func_80AACFA0; - func_8002F434(&this->actor, globalCtx, GI_HEART_PIECE, 10000.0f, 50.0f); + func_8002F434(&this->actor, globalCtx, gSaveContext.n64ddFlag ? GetRandomizedItemIdFromKnownCheck(LH_LAB_DIVE, GI_HEART_PIECE) : GI_HEART_PIECE, 10000.0f, 50.0f); } this->flags |= 1; From 8a8770c79408d48c268e09efa216b9219dcb92c3 Mon Sep 17 00:00:00 2001 From: briaguya Date: Wed, 1 Jun 2022 02:50:37 -0400 Subject: [PATCH 2/2] comment --- soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c | 1 + 1 file changed, 1 insertion(+) 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 9e5c1fc84..70c96fd4e 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 @@ -197,6 +197,7 @@ void func_80AACFA0(EnMk* this, GlobalContext* globalCtx) { this->actionFunc = func_80AACA40; gSaveContext.itemGetInf[1] |= 1; } else { + // not sure when/how/if this is getting called func_8002F434(&this->actor, globalCtx, gSaveContext.n64ddFlag ? GetRandomizedItemIdFromKnownCheck(LH_LAB_DIVE, GI_HEART_PIECE) : GI_HEART_PIECE, 10000.0f, 50.0f); } }