From c08439a5625f8d84809e9b4a89bdb86bf0c42382 Mon Sep 17 00:00:00 2001 From: Vague Rant Date: Mon, 30 May 2022 20:10:39 +1000 Subject: [PATCH] Implement Cow of Time enhancement --- libultraship/libultraship/SohImGuiImpl.cpp | 2 ++ soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp index 67bb3d218..2f660dc7b 100644 --- a/libultraship/libultraship/SohImGuiImpl.cpp +++ b/libultraship/libultraship/SohImGuiImpl.cpp @@ -868,6 +868,8 @@ namespace SohImGui { Tooltip("The default response to Kaepora Gaebora is always that you understood what he said"); EnhancementCheckbox("Disable Navi Call Audio", "gDisableNaviCallAudio"); Tooltip("Disables the voice audio when Navi calls you"); + EnhancementCheckbox("Link's Cow in Both Time Periods", "gCowOfTime"); + Tooltip("Allows the Lon Lon Ranch obstacle course reward to be shared across time periods"); ImGui::EndMenu(); } 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 655dfb6e1..90ff14c31 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 @@ -118,7 +118,7 @@ void EnCow_Init(Actor* thisx, GlobalContext* globalCtx) { func_809DEE9C(this); this->actionFunc = func_809DF96C; if (globalCtx->sceneNum == SCENE_LINK_HOME) { - if (!LINK_IS_ADULT) { + if (!LINK_IS_ADULT && !CVar_GetS32("gCowOfTime", 0)) { Actor_Kill(&this->actor); return; }