From a7c94bba8ca3568355239d136d0c511e15fdb306 Mon Sep 17 00:00:00 2001 From: louist103 <35883445+louist103@users.noreply.github.com> Date: Sun, 10 Jul 2022 21:42:35 -0400 Subject: [PATCH] add the ability to pull graves during the day (#637) --- libultraship/libultraship/ImGuiImpl.cpp | 2 ++ soh/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libultraship/libultraship/ImGuiImpl.cpp b/libultraship/libultraship/ImGuiImpl.cpp index 64798212c..460afdbda 100644 --- a/libultraship/libultraship/ImGuiImpl.cpp +++ b/libultraship/libultraship/ImGuiImpl.cpp @@ -1033,6 +1033,8 @@ namespace SohImGui { EnhancementCheckbox("Enable passage of time on file select", "gTimeFlowFileSelect"); EnhancementCheckbox("Allow the cursor to be on any slot", "gPauseAnyCursor"); Tooltip("Allows the cursor on the pause menu to be over any slot\nSimilar to Rando and Spaceworld 97"); + EnhancementCheckbox("Pull grave during the day", "gDayGravePull"); + Tooltip("Allows graves to be pulled when child during the day"); ImGui::EndMenu(); } diff --git a/soh/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c b/soh/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c index 5aae3399a..79b581db9 100644 --- a/soh/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c +++ b/soh/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c @@ -69,7 +69,7 @@ void func_8087B7E8(BgHaka* this, GlobalContext* globalCtx) { Player* player = GET_PLAYER(globalCtx); if (this->dyna.unk_150 != 0.0f) { - if (globalCtx->sceneNum == SCENE_SPOT02 && !LINK_IS_ADULT && IS_DAY) { + if ((globalCtx->sceneNum == SCENE_SPOT02 && !LINK_IS_ADULT && IS_DAY) && !CVar_GetS32("gDayGravePull", 0)) { this->dyna.unk_150 = 0.0f; player->stateFlags2 &= ~0x10; if (!Gameplay_InCsMode(globalCtx)) {