cclcc-librarymenu: fix Option, Help and Library menu exit

CommitteeOfZero · Sep 15, 2024 · 27d7461 · 27d7461
2 parents 3d31d58 + 01cd3d6
commit 27d7461
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/vm/inst_misc.cpp b/src/vm/inst_misc.cpp
@@ -222,7 +222,7 @@ VmInstruction(InstOption) {
         ResetInstruction;
         BlockThread;
       } else {
-        SetFlag(SF_RETURNTITLE, true);
+        SetFlag(SF_SUBMENUEXIT, true);
         Interface::PADinputButtonWentDown |= Interface::PAD1A;
       }
       ImpLogSlow(LL_Warning, LC_VMStub,
@@ -250,6 +250,14 @@ VmInstruction(InstHelp) {
       ImpLogSlow(LL_Warning, LC_VMStub, "STUB instruction Help(type: Init)\n");
       break;
     case 1:  // Main
+      if (!((Interface::PADinputButtonWentDown & Interface::PAD1B) ||
+            (Interface::PADinputMouseWentDown & Interface::PAD1B))) {
+        ResetInstruction;
+        BlockThread;
+      } else {
+        SetFlag(SF_SUBMENUEXIT, true);
+        Interface::PADinputButtonWentDown |= Interface::PAD1A;
+      }
       ImpLogSlow(LL_Warning, LC_VMStub, "STUB instruction Help(type: Main)\n");
       break;
   }
@@ -308,7 +316,7 @@ VmInstruction(InstAlbum) {
         ResetInstruction;
         BlockThread;
       } else {
-        SetFlag(SF_RETURNTITLE, true);
+        SetFlag(SF_ALBUMEND, true);
         Interface::PADinputButtonWentDown |= Interface::PAD1A;
       }
       ImpLogSlow(LL_Warning, LC_VMStub,