Merge branch 'main' into DebugPlayerSwitch

Author: ReimousTH

MarathonRecomp/patches/video_patches.cpp

@@ -108,3 +108,8 @@ void FurtherObjectShadows(PPCRegister& scope)
 
     scope.u32 = 1;
 }
+
+bool DisableRadialBlur()
+{
+    return Config::RadialBlur == ERadialBlur::Off;
+}

MarathonRecomp/user/config.cpp

@@ -313,6 +313,12 @@ CONFIG_DEFINE_ENUM_TEMPLATE(EWindowState)
     { "Maximized", EWindowState::Maximised }
 };
 
+CONFIG_DEFINE_ENUM_TEMPLATE(ERadialBlur)
+{
+    { "Off", ERadialBlur::Off },
+    { "Original", ERadialBlur::Original },
+};
+
 CONFIG_DEFINE_ENUM_TEMPLATE(EAspectRatio)
 {
     { "Auto", EAspectRatio::Auto },

MarathonRecomp/user/config.h

@@ -120,6 +120,12 @@ enum class EReflectionResolution : int32_t
     Full
 };
 
+enum class ERadialBlur : uint32_t
+{
+    Off,
+    Original
+};
+
 enum class ECutsceneAspectRatio : uint32_t
 {
     Original,

MarathonRecomp/user/config_def.h

@@ -53,6 +53,8 @@ CONFIG_DEFINE("Video", int32_t, WindowWidth, 1280);
 CONFIG_DEFINE("Video", int32_t, WindowHeight, 720);
 CONFIG_DEFINE_ENUM("Video", EWindowState, WindowState, EWindowState::Normal);
 CONFIG_DEFINE_LOCALISED("Video", int32_t, Monitor, 0);
+// TODO: Localise this enum
+CONFIG_DEFINE_ENUM("Video", ERadialBlur, RadialBlur, ERadialBlur::Original);
 CONFIG_DEFINE_ENUM_LOCALISED("Video", EAspectRatio, AspectRatio, EAspectRatio::Auto);
 CONFIG_DEFINE_LOCALISED("Video", float, ResolutionScale, 1.0f);
 CONFIG_DEFINE_LOCALISED("Video", bool, Fullscreen, true);

MarathonRecompLib/config/Marathon.toml

@@ -200,9 +200,13 @@ name = "FurtherObjectShadows"
 address = 0x8260D7E0
 registers = ["r26"]
 
-
-
 [[midasm_hook]]
 name = "DebugPlayerSwitch_0"
 address = 0x82195AD0
 registers = ["r5","r27"]
+
+[[midasm_hook]]
+name = "DisableRadialBlur"
+address = 0x82653834
+jump_address_on_true = 0x82653840
+

README.md

@@ -156,13 +156,15 @@ This project does not plan to support any more platforms other than Windows, Lin
 ### Marathon Recompiled
 - [ga2mer](https://github.com/ga2mer): Creator and Lead Developer of the recompilation.
 
-- [Rei-san](https://github.com/ReimousTH): Game Internals Researcher and Patch Developer.
+- [IsaacMarovitz](https://github.com/IsaacMarovitz): Graphics & Installer Developer.
 
 - [squidbus](https://github.com/squidbus): Graphics Developer.
 
-- [IsaacMarovitz](https://github.com/IsaacMarovitz): Graphics & Installer Developer.
+- [Rei-san](https://github.com/ReimousTH): Game Internals Researcher and Patch Developer.
+
+- [Hyper](https://github.com/hyperbx): Custom Menus, Game Internals Researcher and Patch Developer.
 
-- [Hyper](https://github.com/hyperbx): Custom menus and Game Internals Researcher.
+- [Desko](https://github.com/FateForWindows): Game Internals Researcher and Patch Developer.
 
 - [LJSTAR](https://github.com/LJSTARbird): Artist behind the project logo.