No forced navi (Prevent forced Navi conversations) (#453)

* no forced navi * imgui option for it * remove double owl from sloppy merge Co-authored-by: briaguya <briaguya@alice>
HarbourMasters · Jun 17, 2022 · 3e6307b · 3e6307b
1 parent 36d37d9
commit 3e6307b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp
@@ -881,6 +881,8 @@ namespace SohImGui {
                     Tooltip("Allows equipping the tunic and boots to c-buttons");
                     EnhancementCheckbox("MM Bunny Hood", "gMMBunnyHood");
                     Tooltip("Wearing the Bunny Hood grants a speed increase like in Majora's Mask");
+                    EnhancementCheckbox("No Forced Navi", "gNoForcedNavi");
+                    Tooltip("Prevent forced Navi conversations");
                     EnhancementCheckbox("No Skulltula Freeze", "gSkulltulaFreeze");
                     Tooltip("Stops the game from freezing the player when picking up Gold Skulltulas");
                     EnhancementCheckbox("Disable Navi Call Audio", "gDisableNaviCallAudio");

diff --git a/soh/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c b/soh/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
@@ -110,7 +110,7 @@ void ElfMsg_Destroy(Actor* thisx, GlobalContext* globalCtx) {
 
 s32 ElfMsg_GetMessageId(ElfMsg* this) {
     // Negative message ID forces link to talk to Navi
-    if (this->actor.params & 0x8000) {
+    if (this->actor.params & 0x8000 || CVar_GetS32("gNoForcedNavi", 0) != 0) {
         return (this->actor.params & 0xFF) + 0x100;
     } else {
         return -((this->actor.params & 0xFF) + 0x100);