RestorePauseMissionText

Signed-off-by: Isaac Marovitz <[email protected]>

Author: IsaacMarovitz

MarathonRecomp/api/Marathon.h

@@ -40,6 +40,7 @@
 #include "Sonicteam/HUDCALLBACK.h"
 #include "Sonicteam/HUDLimitTime.h"
 #include "Sonicteam/HUDLoading.h"
+#include "Sonicteam/HUDPause.h"
 #include "Sonicteam/HUDMainDisplay.h"
 #include "Sonicteam/HUDMainMenu.h"
 #include "Sonicteam/HUDMessageWindow.h"

MarathonRecomp/api/Sonicteam/HUDPause.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/SoX/Engine/Task.h>
+
+namespace Sonicteam
+{
+    class HUDPause : public SoX::Engine::Task
+    {
+    public:
+        MARATHON_INSERT_PADDING(0xAC);
+        be<float> m_TextPriority;
+        MARATHON_INSERT_PADDING(0x44);
+        bool m_ShowMissionWindow;
+    };
+}

MarathonRecomp/patches/misc_patches.cpp

@@ -117,4 +117,22 @@ PPC_FUNC(sub_824A6EA8)
     __imp__sub_824A6EA8(ctx, base);
 }
 
+// Sonicteam::HUDPause::ProcessMessage
+PPC_FUNC_IMPL(__imp__sub_824EF788);
+PPC_FUNC(sub_824EF788)
+{
+    if (Config::RestorePauseMissionText)
+        reinterpret_cast<Sonicteam::HUDPause*>(base + ctx.r3.u32)->m_ShowMissionWindow = true;
+
+    __imp__sub_824EF788(ctx, base);
+}
+
+// The mission text is drawn at a lower priority
+// than the mission box by default. 1001.0f is the
+// priority value used by the rest of the pause menu.
+void PauseTask_SetMissionTextPriority(PPCRegister& priority)
+{
+    priority.f64 = 1001.0f;
+}
+
 void NOP() {}

MarathonRecomp/user/config_def.h

@@ -87,6 +87,7 @@ CONFIG_DEFINE_HIDDEN("Codes", bool, RestoreContextualHUDColours, false);
 CONFIG_DEFINE_HIDDEN("Codes", bool, RestoreChaosSpearFlips, false);
 CONFIG_DEFINE_HIDDEN("Codes", bool, RestoreChaosBoostJump, false);
 CONFIG_DEFINE_HIDDEN("Codes", bool, RestoreChainJumpFlips, false);
+CONFIG_DEFINE_HIDDEN("Codes", bool, RestorePauseMissionText, false);
 CONFIG_DEFINE_HIDDEN("Codes", bool, DisableEdgeGrabLeftover, false);
 CONFIG_DEFINE_HIDDEN("Codes", bool, TailsGauge, false);
 CONFIG_DEFINE_HIDDEN("Codes", bool, EnableDebugMode, false);

MarathonRecompLib/config/Marathon.toml

@@ -574,3 +574,8 @@ name = "ObjectVehicleBike_EnemyShot_DisableVehicleCollisionLayer"
 address = 0x822ADBC4
 registers = ["r31"]
 jump_address_on_true = 0x822ADBC8
+
+[[midasm_hook]]
+name = "PauseTask_SetMissionTextPriority"
+address = 0x82509AEC
+registers = ["f1"]