Hero Menu via Skills in the Tween Menu

source/Enderal DLL/src/DialogueMenuPatch.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Util.h"
+
 inline bool bTabBlocked = false;
 
 class DialogueMenuPatch final : public RE::DialogueMenu
@@ -7,8 +9,6 @@ class DialogueMenuPatch final : public RE::DialogueMenu
 public:
 	static void Install()
 	{
-		REL::Relocation<std::uintptr_t> OpenJournalMenuFunc{ 0x0092412C };
-
 		REL::Relocation<uintptr_t> vtbl(RE::VTABLE_DialogueMenu[0]);
 		_ProcessMessageFn = vtbl.write_vfunc(0x4, &ProcessMessageEx);
 	}

source/Enderal DLL/src/EventListener.cpp

@@ -1,7 +1,4 @@
 #include "EventListener.h"
-#include "Util.h"
-#include "DialogueMenuPatch.h"
-#include <shellapi.h>
 
 auto EventListener::GetSingleton() -> EventListener*
 {
@@ -52,6 +49,8 @@ auto EventListener::ProcessEvent(
 		if (a_event->menuName == RE::DialogueMenu::MENU_NAME) {
 			// Make sure Tab is not blocked. If it should be, a Papyrus script will block it a few frames later.
 			DialogueMenuPatch::BlockTab(false);
+		} else if (a_event->menuName == "CustomMenu") {
+			CloseTweenMenu();
 		}
 	} else {
 		if (a_event->menuName == RE::DialogueMenu::MENU_NAME) {

source/Enderal DLL/src/EventListener.h

@@ -1,5 +1,9 @@
 #pragma once
 
+#include "DialogueMenuPatch.h"
+#include "Util.h"
+#include <shellapi.h>
+
 class EventListener :
 	public RE::BSTEventSink<SKSE::ModCallbackEvent>,
 	public RE::BSTEventSink<RE::TESContainerChangedEvent>,

source/Enderal DLL/src/Main.cpp

@@ -7,6 +7,7 @@
 #include "AchievementFix.h"
 #include "BinkInterruptPatch.h"
 #include "DialogueMenuPatch.h"
+#include "Patches/TweenMenuPatch.h"
 
 using namespace SKSE;
 
@@ -169,6 +170,7 @@ SKSEPluginLoad(const LoadInterface* skse) {
 	GetPapyrusInterface()->Register(Papyrus::Bind);
 
 	DialogueMenuPatch::Install();
+	TweenMenuPatch::Install();
 
 	if (g_settings.at("VideoInterruptPatch")) {
 		logger::info("Making videos interruptible...");

source/Enderal DLL/src/Patches/TweenMenuPatch.h

@@ -0,0 +1,39 @@
+#pragma once
+
+inline void OpenMenu(RE::IMenu* tweenMenu, std::int32_t index)
+{
+	using func_t = decltype(&OpenMenu);
+	REL::Relocation<func_t> func{ REL::RelocationID(51845, 51845) };
+	return func(tweenMenu, index);
+}
+
+class TweenMenuPatch final : public RE::TweenMenu
+{
+public:
+	static void Install()
+	{
+		REL::Relocation<uintptr_t> vtbl(RE::VTABLE_TweenMenu[0]);
+		_AcceptFn = vtbl.write_vfunc(0x1, &AcceptEx);
+	}
+
+private:
+
+	void AcceptEx(CallbackProcessor* a_cbReg)
+	{
+		_AcceptFn(this, a_cbReg);
+
+		fxDelegate->callbacks.Remove("OpenHighlightedMenu");
+		a_cbReg->Process("OpenHighlightedMenu", [](const RE::FxDelegateArgs& args) {
+			auto index = args[0].GetSInt();
+			if (index <= 1) {
+				RE::BSTSmartPointer<RE::BSScript::IStackCallbackFunctor> stackCallback;
+				RE::BSScript::Internal::VirtualMachine::GetSingleton()->DispatchStaticCall("_00E_HeroMenu", "Show", RE::MakeFunctionArguments(), stackCallback);
+			} else if (index <= 4) {
+				OpenMenu(RE::UI::GetSingleton()->GetMenu(MENU_NAME).get(), index);
+			}
+		});
+	}
+
+	using AcceptFn = decltype(&Accept);
+	inline static REL::Relocation<AcceptFn> _AcceptFn;
+};

source/Enderal DLL/src/Util.h

@@ -172,3 +172,12 @@ inline void OpenJournal(bool a_bool)
 	REL::Relocation<func_t> func{ REL::RelocationID(52428, 53327) };
 	return func(a_bool);
 }
+
+inline void CloseTweenMenu()
+{
+	if (RE::UI::GetSingleton()->IsMenuOpen(RE::TweenMenu::MENU_NAME)) {
+		using func_t = decltype(&CloseTweenMenu);
+		REL::Relocation<func_t> func{ REL::RelocationID(51839, 52711) };
+		return func();
+	}
+}

source/scripts/_00e_heromenu.psc

@@ -0,0 +1,5 @@
+Scriptname _00E_HeroMenu Hidden
+
+function Show() Global
+	((Game.GetForm(0x10AA2) as Quest).GetAlias(0) as _00E_Game_SkillmenuSC).OpenSkillmenu()
+endfunction