diff --git a/code/client/clrcore-v2/BaseScript.cs b/code/client/clrcore-v2/BaseScript.cs
index 97a42f774b..cc604661ec 100644
--- a/code/client/clrcore-v2/BaseScript.cs
+++ b/code/client/clrcore-v2/BaseScript.cs
@@ -278,7 +278,6 @@ internal void RegisterKeyMap(string command, string description, string inputMap
 #else
 			if (inputMapper != null && inputParameter != null)
 			{
-				Debug.WriteLine(command);
 				Native.CoreNatives.RegisterKeyMapping(command, description, inputMapper, inputParameter);
 			}
 			m_commands.Add(new KeyValuePair<int, DynFunc>(ReferenceFunctionManager.CreateCommand(command, dynFunc, false), dynFunc));
diff --git a/code/client/clrcore-v2/Coroutine/Scheduler.cs b/code/client/clrcore-v2/Coroutine/Scheduler.cs
index 3a8a17a6cd..161ef4163c 100644
--- a/code/client/clrcore-v2/Coroutine/Scheduler.cs
+++ b/code/client/clrcore-v2/Coroutine/Scheduler.cs
@@ -43,6 +43,7 @@ public static void Schedule(Action coroutine)
 				lock (s_nextFrame)
 				{
 					s_nextFrame.Add(coroutine);
+					ScriptInterface.RequestTickNextFrame();
 				}
 			}
 			else
@@ -72,14 +73,30 @@ public static void Schedule(Action coroutine, TimePoint time)
 				lock (s_queue)
 				{
 					// linear ordered insert, performance improvement might be a binary tree (i.e.: priority queue)
-					for (var it = s_queue.First; it != null; it = it.Next)
+					var it = s_queue.First;
+					if (it != null)
 					{
+						// if added to the front, we'll also need to request for a tick/call-in
 						if (time < it.Value.Item1)
 						{
-							s_queue.AddBefore(it, new Tuple<ulong, Action>(time, coroutine));
+							s_queue.AddFirst(new Tuple<ulong, Action>(time, coroutine));
+							ScriptInterface.RequestTick(time);
+
 							return;
 						}
+
+						// check next
+						for (it = it.Next; it != null; it = it.Next)
+						{
+							if (time < it.Value.Item1)
+							{
+								s_queue.AddBefore(it, new Tuple<ulong, Action>(time, coroutine));
+								return;
+							}
+						}
 					}
+					else
+						ScriptInterface.RequestTick(time);
 
 					s_queue.AddLast(new Tuple<ulong, Action>(time, coroutine));
 				}
@@ -168,7 +185,10 @@ internal static void Update()
 						}
 					}
 					else
+					{
+						ScriptInterface.RequestTick(curIt.Value.Item1);
 						return;
+					}
 				}
 			}
 		}
diff --git a/code/client/clrcore-v2/Interop/Types/ScriptSharedData.cs b/code/client/clrcore-v2/Interop/Types/ScriptSharedData.cs
new file mode 100644
index 0000000000..c985bf2faa
--- /dev/null
+++ b/code/client/clrcore-v2/Interop/Types/ScriptSharedData.cs
@@ -0,0 +1,19 @@
+using System.Runtime.InteropServices;
+using System.Threading;
+
+namespace CitizenFX.Core
+{
+	[StructLayout(LayoutKind.Explicit)]
+	internal struct ScriptSharedData
+	{
+		/// <summary>
+		/// Next time when our host needs to call in again
+		/// </summary>
+		[FieldOffset(0)] public ulong m_scheduledTime;
+
+		/// <summary>
+		/// Same as <see cref="m_scheduledTime"/> but used in methods like <see cref="Interlocked.CompareExchange(ref long, long, long)" /> who miss a <see cref="ulong"/> overload.
+		/// </summary>
+		[FieldOffset(0)] public long m_scheduledTimeAsLong;
+	};
+}
diff --git a/code/client/clrcore-v2/ScriptInterface.cs b/code/client/clrcore-v2/ScriptInterface.cs
index 595531199e..07e6d9535e 100644
--- a/code/client/clrcore-v2/ScriptInterface.cs
+++ b/code/client/clrcore-v2/ScriptInterface.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Security;
+using System.Threading;
 
 #if IS_FXSERVER
 using ContextType = CitizenFX.Core.fxScriptContext;
@@ -12,8 +12,6 @@
 
 /*
 * Notes while working on this environment:
-*  - Scheduling: any function that can potentially add tasks to the C#'s scheduler needs to return the time
-*    of when it needs to be activated again, which then needs to be scheduled in the core scheduler (bookmark).
 */
 
 namespace CitizenFX.Core
@@ -25,6 +23,8 @@ internal static class ScriptInterface
 		internal static string ResourceName { get; private set; }
 		internal static CString CResourceName { get; private set; }
 
+		private static unsafe ScriptSharedData* s_sharedData;
+
 		#region Callable from C#
 
 		[SecurityCritical, MethodImpl(MethodImplOptions.InternalCall)]
@@ -71,16 +71,37 @@ internal static class ScriptInterface
 		[SecurityCritical]
 		internal static unsafe bool ReadAssembly(string file, out byte[] assembly, out byte[] symbols) => ReadAssembly(s_runtime, file, out assembly, out symbols);
 
+		/// <summary>
+		/// Schedule a call-in at the given time, uses CAS to make sure we only overwrite if the given time is earlier than the stored one.
+		/// </summary>
+		/// <param name="time">Next time to request a call in</param>
+		[SecuritySafeCritical]
+		internal static unsafe void RequestTick(ulong time)
+		{			
+			ulong prevTime = (ulong)Interlocked.Read(ref s_sharedData->m_scheduledTimeAsLong);
+			while (time < prevTime)
+			{
+				prevTime = (ulong)Interlocked.CompareExchange(ref s_sharedData->m_scheduledTimeAsLong, (long)time, (long)prevTime);
+			}
+		}
+
+		/// <summary>
+		/// Schedule a call-in for the next frame.
+		/// </summary>
+		[SecuritySafeCritical]
+		public static unsafe void RequestTickNextFrame() => s_sharedData->m_scheduledTime = 0UL; // 64 bit read/writes – while aligned – are atomic on 64 bit machines
+
 		#endregion
 
 		#region Called by Native
 		[SecurityCritical, SuppressMessage("System.Diagnostics.CodeAnalysis", "IDE0051", Justification = "Called by host")]
-		internal static void Initialize(string resourceName, UIntPtr runtime, int instanceId)
+		private static unsafe void Initialize(string resourceName, UIntPtr runtime, int instanceId, ScriptSharedData* sharedData)
 		{
 			s_runtime = runtime;
 			InstanceId = instanceId;
 			ResourceName = resourceName;
 			CResourceName = resourceName;
+			s_sharedData = sharedData;
 
 			Resource.Current = new Resource(resourceName);
 			Debug.Initialize(resourceName);
@@ -93,7 +114,7 @@ internal static void Initialize(string resourceName, UIntPtr runtime, int instan
 		}
 
 		[SecurityCritical, SuppressMessage("System.Diagnostics.CodeAnalysis", "IDE0051", Justification = "Called by host")]
-		internal static ulong Tick(ulong hostTime, bool profiling)
+		internal static void Tick(ulong hostTime, bool profiling)
 		{
 			Scheduler.CurrentTime = (TimePoint)hostTime;
 			Profiler.IsProfiling = profiling;
@@ -107,12 +128,10 @@ internal static ulong Tick(ulong hostTime, bool profiling)
 			{
 				Debug.PrintError(e, "Tick()");
 			}
-
-			return Scheduler.NextTaskTime();
 		}
 
 		[SecurityCritical, SuppressMessage("System.Diagnostics.CodeAnalysis", "IDE0051", Justification = "Called by host")]
-		internal static unsafe ulong TriggerEvent(string eventName, byte* argsSerialized, int serializedSize, string sourceString, ulong hostTime, bool profiling)
+		internal static unsafe void TriggerEvent(string eventName, byte* argsSerialized, int serializedSize, string sourceString, ulong hostTime, bool profiling)
 		{
 			Scheduler.CurrentTime = (TimePoint)hostTime;
 			Profiler.IsProfiling = profiling;
@@ -136,30 +155,24 @@ internal static unsafe ulong TriggerEvent(string eventName, byte* argsSerialized
 					EventsManager.IncomingEvent(eventName, sourceString, origin, argsSerialized, serializedSize, args);
 				}
 			}
-			
-			return Scheduler.NextTaskTime();
 		}
 
 		[SecurityCritical, SuppressMessage("System.Diagnostics.CodeAnalysis", "IDE0051", Justification = "Called by host")]
-		internal static unsafe ulong LoadAssembly(string name, ulong hostTime, bool profiling)
+		internal static unsafe void LoadAssembly(string name, ulong hostTime, bool profiling)
 		{
 			Scheduler.CurrentTime = (TimePoint)hostTime;
 			Profiler.IsProfiling = profiling;
 
 			ScriptManager.LoadAssembly(name, true);
-
-			return Scheduler.NextTaskTime();
 		}
 
 		[SecurityCritical, SuppressMessage("System.Diagnostics.CodeAnalysis", "IDE0051", Justification = "Called by host")]
-		internal static unsafe ulong CallRef(int refIndex, byte* argsSerialized, uint argsSize, out IntPtr retvalSerialized, out uint retvalSize, ulong hostTime, bool profiling)
+		internal static unsafe void CallRef(int refIndex, byte* argsSerialized, uint argsSize, out IntPtr retvalSerialized, out uint retvalSize, ulong hostTime, bool profiling)
 		{
 			Scheduler.CurrentTime = (TimePoint)hostTime;
 			Profiler.IsProfiling = profiling;
 
 			ReferenceFunctionManager.IncomingCall(refIndex, argsSerialized, argsSize, out retvalSerialized, out retvalSize);
-
-			return Scheduler.NextTaskTime();
 		}
 
 		[SecurityCritical, SuppressMessage("System.Diagnostics.CodeAnalysis", "IDE0051", Justification = "Called by host")]
diff --git a/code/components/citizen-resources-gta/src/ResourcesTest.cpp b/code/components/citizen-resources-gta/src/ResourcesTest.cpp
index 54862be1b8..3eda413fc0 100644
--- a/code/components/citizen-resources-gta/src/ResourcesTest.cpp
+++ b/code/components/citizen-resources-gta/src/ResourcesTest.cpp
@@ -57,6 +57,11 @@ namespace streaming
 	void RemoveDataFileFromLoadList(const std::string& type, const std::string& path);
 
 	void SetNextLevelPath(const std::string& path);
+
+#if defined(IS_RDR3)
+	void SetTrainTrackFilePath(const std::string& path);
+	void SetTrolleyCableFilePath(const std::string& path);
+#endif
 }
 #endif
 
@@ -188,6 +193,18 @@ static InitFunction initFunction([] ()
 				streaming::SetNextLevelPath(resourceRoot + meta.second);
 			}
 
+#if defined(IS_RDR3)
+			for (auto& meta : metaData->GetEntries("replace_traintrack_file"))
+			{
+				streaming::SetTrainTrackFilePath(resourceRoot + meta.second);
+			}
+
+			for (auto& meta : metaData->GetEntries("replace_trolley_cable_file"))
+			{
+				streaming::SetTrolleyCableFilePath(resourceRoot + meta.second);
+			}
+#endif
+
 			if (!RangeLengthMatches(metaData->GetEntries("data_file"), metaData->GetEntries("data_file_extra")))
 			{
 				GlobalError("data_file entry count mismatch in resource %s", resource->GetName());
diff --git a/code/components/citizen-scripting-mono-v2/include/MonoScriptRuntime.h b/code/components/citizen-scripting-mono-v2/include/MonoScriptRuntime.h
index de2383912b..127722df19 100644
--- a/code/components/citizen-scripting-mono-v2/include/MonoScriptRuntime.h
+++ b/code/components/citizen-scripting-mono-v2/include/MonoScriptRuntime.h
@@ -18,10 +18,11 @@
 #include <om/OMComponent.h>
 
 #include "MonoMethods.h"
+#include "ScriptSharedData.h"
 
 namespace fx::mono
 {
-class MonoScriptRuntime : public fx::OMClass<MonoScriptRuntime, IScriptRuntime, IScriptFileHandlingRuntime, IScriptTickRuntimeWithBookmarks,
+class MonoScriptRuntime : public fx::OMClass<MonoScriptRuntime, IScriptRuntime, IScriptFileHandlingRuntime, IScriptTickRuntime,
 	IScriptEventRuntime, IScriptRefRuntime, IScriptMemInfoRuntime, /*IScriptStackWalkingRuntime,*/ IScriptDebugRuntime, IScriptProfiler>
 {
 private:
@@ -35,22 +36,22 @@ class MonoScriptRuntime : public fx::OMClass<MonoScriptRuntime, IScriptRuntime,
 	IScriptHost* m_scriptHost;
 	IScriptHostWithResourceData* m_resourceHost;
 	IScriptHostWithManifest* m_manifestHost;
-	IScriptHostWithBookmarks* m_bookmarkHost;
 
 	fx::OMPtr<IScriptRuntimeHandler> m_handler;
 	fx::Resource* m_parentObject;
 	IDebugEventListener* m_debugListener;
 	std::unordered_map<std::string, int> m_scriptIds;
-	uint64_t m_scheduledTime = ~uint64_t(0);
+
+	ScriptSharedData m_sharedData;
 
 	// method targets
 	Method m_loadAssembly;
 
 	// method thunks, these are for calls that require performance
-	Thunk<uint32_t(uint64_t gameTime, bool profiling)> m_tick;
-	Thunk<uint32_t(MonoString* eventName, const char* argsSerialized, uint32_t serializedSize, MonoString* sourceId, uint64_t gameTime, bool profiling)> m_triggerEvent;
+	Thunk<void(uint64_t gameTime, bool profiling)> m_tick;
+	Thunk<void(MonoString* eventName, const char* argsSerialized, uint32_t serializedSize, MonoString* sourceId, uint64_t gameTime, bool profiling)> m_triggerEvent;
 
-	Thunk<uint32_t(int32_t refIndex, char* argsSerialized, uint32_t argsSize, char** retvalSerialized, uint32_t* retvalSize, uint64_t gameTime, bool profiling)> m_callRef;
+	Thunk<void(int32_t refIndex, char* argsSerialized, uint32_t argsSize, char** retvalSerialized, uint32_t* retvalSize, uint64_t gameTime, bool profiling)> m_callRef;
 	Thunk<void(int32_t refIndex, int32_t* newRefIdx)> m_duplicateRef = nullptr;
 	Thunk<void(int32_t refIndex)> m_removeRef = nullptr;
 
@@ -75,9 +76,7 @@ class MonoScriptRuntime : public fx::OMClass<MonoScriptRuntime, IScriptRuntime,
 
 	NS_DECL_ISCRIPTFILEHANDLINGRUNTIME;
 
-	NS_DECL_ISCRIPTTICKRUNTIMEWITHBOOKMARKS;
-
-	void ScheduleTick(uint64_t timeMilliseconds);
+	NS_DECL_ISCRIPTTICKRUNTIME;
 
 	NS_DECL_ISCRIPTEVENTRUNTIME;
 
@@ -97,13 +96,4 @@ inline MonoScriptRuntime::MonoScriptRuntime()
 	m_instanceId = rand();
 	m_name = "ScriptDomain_" + std::to_string(m_instanceId);
 }
-
-inline void MonoScriptRuntime::ScheduleTick(uint64_t timeMilliseconds)
-{
-	if (timeMilliseconds < m_scheduledTime)
-	{
-		m_scheduledTime = timeMilliseconds;
-		m_bookmarkHost->ScheduleBookmark(this, 0, timeMilliseconds * 1000); // positive values are expected to me microseconds and absolute
-	}
-}
 }
diff --git a/code/components/citizen-scripting-mono-v2/include/ScriptSharedData.h b/code/components/citizen-scripting-mono-v2/include/ScriptSharedData.h
new file mode 100644
index 0000000000..d8137fc839
--- /dev/null
+++ b/code/components/citizen-scripting-mono-v2/include/ScriptSharedData.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include <atomic>
+
+namespace fx::mono
+{
+struct ScriptSharedData
+{
+public:
+	std::atomic<uint64_t> m_scheduledTime = ~uint64_t(0);
+};
+}
diff --git a/code/components/citizen-scripting-mono-v2/src/MonoScriptRuntime.cpp b/code/components/citizen-scripting-mono-v2/src/MonoScriptRuntime.cpp
index 28e60dad65..3c4ea2c0a3 100644
--- a/code/components/citizen-scripting-mono-v2/src/MonoScriptRuntime.cpp
+++ b/code/components/citizen-scripting-mono-v2/src/MonoScriptRuntime.cpp
@@ -104,11 +104,6 @@ result_t MonoScriptRuntime::Create(IScriptHost* host)
 			fx::OMPtr<IScriptHostWithManifest> manifestPtr;
 			ptr.As(&manifestPtr);
 			m_manifestHost = manifestPtr.GetRef();
-
-			fx::OMPtr<IScriptHostWithBookmarks> bookmarkPtr;
-			ptr.As(&bookmarkPtr);
-			m_bookmarkHost = bookmarkPtr.GetRef();
-			m_bookmarkHost->CreateBookmarks(this);
 		}
 
 		char* resourceName = nullptr;
@@ -134,7 +129,7 @@ result_t MonoScriptRuntime::Create(IScriptHost* host)
 		auto* thisPtr = this;
 		MonoException* exc;
 		auto initialize = Method::Find(image, "CitizenFX.Core.ScriptInterface:Initialize");
-		initialize({ mono_string_new(m_appDomain, resourceName), &thisPtr, &m_instanceId }, &exc);
+		initialize({ mono_string_new(m_appDomain, resourceName), &thisPtr, &m_instanceId, &m_sharedData }, &exc);
 
 		mono_domain_set_internal(mono_get_root_domain()); // back to root for v1
 
@@ -172,16 +167,26 @@ result_t MonoScriptRuntime::Destroy()
 
 	m_appDomain = nullptr;
 	m_scriptHost = nullptr;
-	m_bookmarkHost->RemoveBookmarks(this);
-	m_bookmarkHost = nullptr;
 
 	mono_domain_set_internal(mono_get_root_domain()); // back to root for v1
 
 	return ReturnOrError(exc);
 }
 
-result_t MonoScriptRuntime::TickBookmarks(uint64_t* bookmarks, int32_t numBookmarks)
+result_t MonoScriptRuntime::Tick()
 {
+	// Tick-less: we don't pay for runtime entry and exit costs if there's nothing to do.
+	{
+		auto nextScheduledTime = m_sharedData.m_scheduledTime.load();
+		if (GetCurrentSchedulerTime() < nextScheduledTime)
+		{
+			return FX_S_OK;
+		}
+
+		// We can ignore the time between the load above and the store below as the runtime will set this value again if there's still work to do
+		m_sharedData.m_scheduledTime.store(~uint64_t(0));
+	}
+
 	m_handler->PushRuntime(static_cast<IScriptRuntime*>(this));
 	if (m_parentObject)
 		m_parentObject->OnActivate();
@@ -190,12 +195,8 @@ result_t MonoScriptRuntime::TickBookmarks(uint64_t* bookmarks, int32_t numBookma
 
 	MONO_BOUNDARY_START
 
-	// reset scheduled time, nextTick will set the next time
-	m_scheduledTime = ~uint64_t(0);
-
 	MonoException* exc;
-	uint64_t nextTick = m_tick(GetCurrentSchedulerTime(), IsProfiling(), &exc);
-	ScheduleTick(nextTick);
+	m_tick(GetCurrentSchedulerTime(), IsProfiling(), &exc);
 
 	MONO_BOUNDARY_END
 
@@ -216,12 +217,10 @@ result_t MonoScriptRuntime::TriggerEvent(char* eventName, char* argsSerialized,
 	MONO_BOUNDARY_START
 
 	MonoException* exc = nullptr;
-	uint64_t nextTick = m_triggerEvent(mono_string_new(m_appDomain, eventName),
+	m_triggerEvent(mono_string_new(m_appDomain, eventName),
 		argsSerialized, serializedSize, mono_string_new(m_appDomain, sourceId),
 		GetCurrentSchedulerTime(), IsProfiling(), &exc);
 
-	ScheduleTick(nextTick);
-
 	MONO_BOUNDARY_END
 
 	return ReturnOrError(exc);
@@ -327,9 +326,7 @@ result_t MonoScriptRuntime::LoadFile(char* scriptFile)
 	bool isProfiling = IsProfiling();
 
 	MonoException* exc = nullptr;
-	MonoObject* nextTickObject = m_loadAssembly({ mono_string_new(m_appDomain, scriptFile), &currentTime, &isProfiling }, &exc);
-	uint64_t nextTick = *reinterpret_cast<uint64_t*>(mono_object_unbox(nextTickObject));
-	ScheduleTick(nextTick);
+	m_loadAssembly({ mono_string_new(m_appDomain, scriptFile), &currentTime, &isProfiling }, &exc);
 	
 	console::PrintWarning(_CFX_NAME_STRING(_CFX_COMPONENT_NAME),
 		"Assembly %s has been loaded into the mono rt2 runtime. This runtime is still in beta and shouldn't be used in production, "
@@ -348,8 +345,7 @@ result_t MonoScriptRuntime::CallRef(int32_t refIndex, char* argsSerialized, uint
 	MonoDomainScope scope(m_appDomain);
 
 	MonoException* exc = nullptr;
-	uint64_t nextTick = m_callRef(refIndex, argsSerialized, argsSize, retvalSerialized, retvalSize, GetCurrentSchedulerTime(), IsProfiling(), &exc);
-	ScheduleTick(nextTick);
+	m_callRef(refIndex, argsSerialized, argsSize, retvalSerialized, retvalSize, GetCurrentSchedulerTime(), IsProfiling(), &exc);
 
 	return ReturnOrError(exc);
 }
diff --git a/code/components/conhost-v2/src/ConsoleHostImpl.cpp b/code/components/conhost-v2/src/ConsoleHostImpl.cpp
index 245a8197eb..be9550d9ac 100644
--- a/code/components/conhost-v2/src/ConsoleHostImpl.cpp
+++ b/code/components/conhost-v2/src/ConsoleHostImpl.cpp
@@ -363,6 +363,10 @@ void OnConsoleFrameDraw(int width, int height, bool usedSharedD3D11)
 	{
 		return;
 	}
+	else if (g_pd3dDeviceContext == nullptr)
+	{
+		return;
+	}
 
 #ifndef IS_FXSERVER
 	static ConVar<bool> winConsoleVar("con_winconsole", ConVar_Archive | ConVar_UserPref, false, &g_winConsole);
diff --git a/code/components/conhost-v2/src/DrawPerf.cpp b/code/components/conhost-v2/src/DrawPerf.cpp
index e57b47a1a8..b7a6fb5a2f 100644
--- a/code/components/conhost-v2/src/DrawPerf.cpp
+++ b/code/components/conhost-v2/src/DrawPerf.cpp
@@ -74,7 +74,7 @@ static LUID GetAdapterLUID()
 	auto adapter = GetAdapter();
 
 	DXGI_ADAPTER_DESC desc;
-	if (SUCCEEDED(adapter->GetDesc(&desc)))
+	if (adapter && SUCCEEDED(adapter->GetDesc(&desc)))
 	{
 		adapterLuid = desc.AdapterLuid;
 	}
@@ -387,10 +387,10 @@ static InitFunction initFunction([]()
 	{
 		if (IsWindows10OrGreater())
 		{
-			static auto adapter = GetAdapter();
+			auto adapter = GetAdapter();
 			Microsoft::WRL::ComPtr<IDXGIAdapter3> adapter3;
 
-			if (SUCCEEDED(adapter.As(&adapter3)))
+			if (adapter && SUCCEEDED(adapter.As(&adapter3)))
 			{
 				DXGI_ADAPTER_DESC desc;
 				adapter->GetDesc(&desc);
diff --git a/code/components/extra-natives-five/src/NativeEdits.cpp b/code/components/extra-natives-five/src/NativeEdits.cpp
index 0042f7ed96..8f04a59a3d 100644
--- a/code/components/extra-natives-five/src/NativeEdits.cpp
+++ b/code/components/extra-natives-five/src/NativeEdits.cpp
@@ -1,12 +1,111 @@
 #include <StdInc.h>
 #include <GameInit.h>
+
 #include <Hooking.h>
+
 #include <ScriptEngine.h>
+#include <scrEngine.h>
+
+namespace rage
+{
+class aiTaskTree
+{
+public:
+	bool FindActiveTaskByType(int taskIndex);
+};
+};
+
+class CPedIntelligence
+{
+public:
+	inline static ptrdiff_t kMotionTreeOffset;
+	inline static ptrdiff_t kPedIntelligenceOffset;
+
+public:
+	inline rage::aiTaskTree* GetMotionTaskTree()
+	{
+		auto location = reinterpret_cast<char*>(this) + kMotionTreeOffset;
+		return *reinterpret_cast<rage::aiTaskTree**>(location);
+	}
+
+	inline bool HasMotionTaskByType(int32_t taskIndex)
+	{
+		if (auto tree = GetMotionTaskTree())
+		{
+			return tree->FindActiveTaskByType(taskIndex);
+		}
+		return false;
+	}
+
+	// Utility function that should eventually be moved to CPed
+	static inline CPedIntelligence* GetIntelligence(CPed* ped)
+	{
+		auto location = reinterpret_cast<char*>(ped) + kPedIntelligenceOffset;
+		return *reinterpret_cast<CPedIntelligence**>(location);
+	}
+};
+
+static hook::cdecl_stub<bool(rage::aiTaskTree*, int)> _findTaskByType([]()
+{
+	return hook::get_pattern("83 79 10 FF 74 20 48 63 41 10 48 8B 4C C1");
+});
+
+bool rage::aiTaskTree::FindActiveTaskByType(int taskIndex)
+{
+	return _findTaskByType(this, taskIndex);
+}
+
+// GH-2401: Have GET_IS_TASK_ACTIVE search the motion-tree for TASK_COMBAT_ROLL.
+// CTaskCombatRoll is used only as a subtask of CTaskMotionAiming which will not
+// be exposed via GET_IS_TASK_ACTIVE.
+static void EditIsTaskActive()
+{
+	constexpr uint64_t GET_IS_TASK_ACTIVE = 0xB0760331C7AA4155;
+
+	const auto originalHandler = fx::ScriptEngine::GetNativeHandler(GET_IS_TASK_ACTIVE);
+	if (!originalHandler)
+	{
+		return;
+	}
+
+	const auto handler = *originalHandler;
+	fx::ScriptEngine::RegisterNativeHandler(GET_IS_TASK_ACTIVE, [handler](fx::ScriptContext& ctx)
+	{
+		constexpr int32_t TASK_COMBAT_ROLL = 0x3;
+		uint32_t pedHandle = ctx.GetArgument<uint32_t>(0);
+		uint32_t taskIndex = ctx.GetArgument<uint32_t>(1);
+
+		handler(ctx);
+		if (taskIndex != TASK_COMBAT_ROLL || ctx.GetResult<bool>())
+		{
+			return;
+		}
+
+		// Could not find TASK_COMBAT_ROLL check the peds motion task tree.
+		auto ped = rage::fwScriptGuid::GetBaseFromGuid(pedHandle);
+		if (ped && ped->IsOfType<CPed>())
+		{
+			if (auto intelligence = CPedIntelligence::GetIntelligence(reinterpret_cast<CPed*>(ped)))
+			{
+				if (intelligence->HasMotionTaskByType(TASK_COMBAT_ROLL))
+				{
+					ctx.SetResult<bool>(true);
+				}
+			}
+		}
+	});
+}
 
 static bool* g_ropesCreateNetworkWorldState;
 
 static HookFunction hookFunction([]()
 {
+	{
+		auto location = hook::get_pattern<char>("84 C0 0F 84 ? ? ? ? 48 8B 82 ? ? ? ? BA");
+		CPedIntelligence::kPedIntelligenceOffset = *reinterpret_cast<int32_t*>(location + 0xB);
+		CPedIntelligence::kMotionTreeOffset = *reinterpret_cast<int32_t*>(location + 0x17);
+	}
+
 	g_ropesCreateNetworkWorldState = (bool*)hook::AllocateStubMemory(1);
 	*g_ropesCreateNetworkWorldState = false;
 
@@ -24,4 +123,9 @@ static HookFunction hookFunction([]()
 	{
 		*g_ropesCreateNetworkWorldState = false;
 	});
+
+	rage::scrEngine::OnScriptInit.Connect([]()
+	{
+		EditIsTaskActive();
+	});
 });
diff --git a/code/components/extra-natives-five/src/NuiAudioSink.cpp b/code/components/extra-natives-five/src/NuiAudioSink.cpp
index 30dac53f53..0e3d8076d1 100644
--- a/code/components/extra-natives-five/src/NuiAudioSink.cpp
+++ b/code/components/extra-natives-five/src/NuiAudioSink.cpp
@@ -1074,14 +1074,15 @@ namespace rage
 		static audCategoryControllerManager* GetInstance();
 	};
 
+	static audCategoryControllerManager** g_audCategoryControllerManager = nullptr;
 	audCategoryControllerManager* audCategoryControllerManager::GetInstance()
 	{
-#ifdef GTA_FIVE
-		static auto patternRef = hook::get_address<audCategoryControllerManager**>(hook::get_pattern("45 33 C0 BA 90 1C E2 44 E8", -4));
-#elif IS_RDR3
-		static auto patternRef = hook::get_address<audCategoryControllerManager**>(hook::get_pattern("48 8B 0D ? ? ? ? E8 ? ? ? ? 8B 15 ? ? ? ? 48 8D 0D ? ? ? ? E8", 3));
-#endif
-		return *patternRef;
+		if (!g_audCategoryControllerManager)
+		{
+			return nullptr;
+		}
+
+		return *g_audCategoryControllerManager;
 	}
 
 	static hook::thiscall_stub<char*(audCategoryControllerManager*, uint32_t)> _audCategoryControllerManager_CreateController([]()
@@ -1108,6 +1109,8 @@ namespace rage
 		initParamVal = hook::get_address<uint8_t*>(hook::get_pattern("BA 11 CC 23 C3 E8 ? ? ? ? 48 8D", 0x16));
 
 		audDriver::sm_Mixer = hook::get_address<audMixerDevice**>(hook::get_pattern("75 64 44 0F B7 45 06 48 8B 0D", 10));
+
+		g_audCategoryControllerManager = hook::get_address<audCategoryControllerManager**>(hook::get_pattern("45 33 C0 BA 90 1C E2 44 E8", -4));
 #elif IS_RDR3
 		g_frontendAudioEntity = hook::get_address<audEntityBase*>(hook::get_pattern("48 8D 0D ? ? ? ? E8 ? ? ? ? 45 84 E4 74 ? 39 1D"), 3, 7);
 
@@ -1116,6 +1119,8 @@ namespace rage
 		initParamVal = hook::get_address<uint8_t*>(hook::get_pattern("8A 05 ? ? ? ? 48 8B CF F3 0F 11 45 ? 88 45 66"), 2, 6);
 
 		audDriver::sm_Mixer = hook::get_address<audMixerDevice**>(hook::get_pattern("48 8B 05 ? ? ? ? 44 38 8C 01 ? ? ? ? 0F"), 3, 7);
+
+		g_audCategoryControllerManager = hook::get_address<audCategoryControllerManager**>(hook::get_pattern("48 8B 0D ? ? ? ? E8 ? ? ? ? 8B 15 ? ? ? ? 48 8D 0D ? ? ? ? E8", 3));
 #endif
 	});
 #ifdef GTA_FIVE
diff --git a/code/components/extra-natives-five/src/WeaponExtraNatives.cpp b/code/components/extra-natives-five/src/WeaponExtraNatives.cpp
index d218242634..c834e677ad 100644
--- a/code/components/extra-natives-five/src/WeaponExtraNatives.cpp
+++ b/code/components/extra-natives-five/src/WeaponExtraNatives.cpp
@@ -97,13 +97,13 @@ static flashlightProcessFn origFlashlightProcess;
 
 static std::atomic_bool g_SET_FLASH_LIGHT_KEEP_ON_WHILE_MOVING = false;
 
+static unsigned char* g_flashlightAndByte = nullptr;
 static void Flashlight_Process(CWeaponComponentFlashlight* thisptr, CPed* ped)
 {
 	// Copy every flag except for FLASHLIGHT_ON which is 1
 	// 80 63 49 FE          and     byte ptr [rbx+49h], 0FEh
 	// change to 0xFF so it copies the ON flag as well
 	// (This byte is located in the original Flashlight::Process() function.)
-	static unsigned char* g_flashlightAndByte = hook::get_pattern<unsigned char>("80 63 49 FE EB", 3);
 
 	if (!g_SET_FLASH_LIGHT_KEEP_ON_WHILE_MOVING)
 	{
@@ -222,14 +222,11 @@ static void* CTaskGun_Stage1_1_TransitionStage(void* CTask, int newStage)
 
 typedef void* (*CTaskAimGunOnFootProcessStagesFn)(unsigned char*, int, int);
 static CTaskAimGunOnFootProcessStagesFn origCTaskAimGunOnFoot_ProcessStages;
+typedef CWeapon* (*GetWeaponFn)(void*);
+static uint32_t pedOffsetToWeaponMgr = 0;
+static GetWeaponFn GetWeapon = nullptr;
 static void* CTaskAimGunOnFoot_ProcessStages(unsigned char* thisptr, int stage, int substage)
 {
-	// Borrow the GetWeapon() and offset into Ped from another vfunc in this class.
-	static unsigned char* addr = hook::get_pattern<unsigned char>("0F 84 ? ? ? ? 48 8B 8F ? ? ? ? E8 ? ? ? ? 48 8B F0");
-	static uint32_t pedOffsetToWeaponMgr = *(uint32_t*)(addr + 9);
-	typedef CWeapon* (*GetWeaponFn)(void*);
-	static GetWeaponFn GetWeapon = hook::get_address<GetWeaponFn>((uintptr_t)addr + 13, 1, 5);
-
 	CPed* ped = *(CPed**)(thisptr + 16);
 
 	if (!(g_SET_WEAPONS_NO_AUTOSWAP || g_SET_WEAPONS_NO_AUTORELOAD) || ped != getLocalPlayerPed())
@@ -473,6 +470,17 @@ static HookFunction hookFunction([]()
 		hook::put(&flashlightVtable[index], (uintptr_t)Flashlight_Process);
 	}
 
+	// Borrow the GetWeapon() and offset into Ped from another vfunc in this class.
+	{
+		unsigned char* addr = hook::get_pattern<unsigned char>("0F 84 ? ? ? ? 48 8B 8F ? ? ? ? E8 ? ? ? ? 48 8B F0");
+		pedOffsetToWeaponMgr = *(uint32_t*)(addr + 9);
+		GetWeapon = hook::get_address<GetWeaponFn>((uintptr_t)addr + 13, 1, 5);
+	}
+
+	{
+		g_flashlightAndByte = hook::get_pattern<unsigned char>("80 63 49 FE EB", 3);
+	}
+
 	// Disable auto-swaps
 	{
 		void* autoswap;
diff --git a/code/components/gta-core-five/include/RageInput.h b/code/components/gta-core-five/include/RageInput.h
new file mode 100644
index 0000000000..6ce81b6c86
--- /dev/null
+++ b/code/components/gta-core-five/include/RageInput.h
@@ -0,0 +1,64 @@
+/*
+ * This file is part of the CitizenFX project - http://citizen.re/
+ *
+ * See LICENSE and MENTIONS in the root of the source tree for information
+ * regarding licensing.
+ */
+
+#pragma once
+
+#include <cstdint>
+
+namespace rage
+{
+static constexpr size_t INPUT_PUSH_TO_TALK = 249;
+
+/// parEnumDefinition can be found at "0C 00 01 00 E0 7D 86 3D" - 0x10
+enum ioParameterMask : int32_t
+{
+	IOMT_KEYBOARD = 0x0, // 0xE38B382A
+	IOMT_MOUSE_AXIS = 0x200, // 0x140D3D7E
+	IOMT_MOUSE_WHEEL = 0x400, // 0x2AE06A4A
+	IOMT_MOUSE_BUTTON = 0x800, // 0xEC193160
+	IOMT_PAD_AXIS = 0x1000, // 0x5A190AB4
+	IOMT_PAD_INDEX = 0x2000, // 0x6A1EB78C
+	IOMT_JOYSTICK_POV = 0x4000, // 0x68BA5FB3
+	IOMT_JOYSTICK_BUTTON = 0x8000, // 0xB0629D0A
+	IOMT_JOYSTICK_AXIS = 0x10000, // 0x2D02D576
+	IOMT_PAD_BUTTON = 0x20000, // 0xB1639048
+	IOMT_JOYSTICK_AXIS_NEGATIVE = 0x40000, // 0xFC6BC167
+	IOMT_JOYSTICK_AXIS_POSITIVE = 0x80000, // 0x0722DC0F
+};
+
+enum ioMapperSource : int32_t
+{
+	IOMS_UNDEFINED = -1,
+	IOMS_KEYBOARD = 0,
+	IOMS_MOUSE_ABSOLUTEAXIS = 1,
+	IOMS_MOUSE_CENTEREDAXIS = 2,
+	IOMS_MOUSE_RELATIVEAXIS = 3,
+	IOMS_MOUSE_SCALEDAXIS = 4,
+	IOMS_MOUSE_NORMALIZED = 5,
+	IOMS_MOUSE_WHEEL = 6,
+	IOMS_MOUSE_BUTTON = 7,
+	IOMS_MOUSE_BUTTONANY = 8,
+	IOMS_PAD_DIGITALBUTTON = 9,
+	IOMS_PAD_DIGITALBUTTONANY = 10,
+	IOMS_PAD_ANALOGBUTTON = 11,
+	IOMS_PAD_AXIS = 12,
+	IOMS_JOYSTICK_BUTTON = 13,
+	IOMS_JOYSTICK_AXIS = 14,
+	IOMS_JOYSTICK_IAXIS = 15,
+	IOMS_JOYSTICK_AXIS_NEGATIVE = 16,
+	IOMS_JOYSTICK_AXIS_POSITIVE = 17,
+	IOMS_JOYSTICK_POV = 18,
+	IOMS_JOYSTICK_POV_AXIS = 19,
+	IOMS_PAD_DEBUGBUTTON = 20,
+	IOMS_DIGITALBUTTON_AXIS = 21,
+	IOMS_MKB_AXIS = 22,
+	IOMS_TOUCHPAD_ABSOLUTE_AXIS = 23,
+	IOMS_TOUCHPAD_CENTERED_AXIS = 24,
+	IOMS_GAME_CONTROLLED = 25, // Added in prior to b1604
+	IOMS_FORCE32 = 2147483647,
+};
+}
diff --git a/code/components/gta-core-five/src/BlockLoadSetters.cpp b/code/components/gta-core-five/src/BlockLoadSetters.cpp
index 2d18257170..bb1304c60a 100644
--- a/code/components/gta-core-five/src/BlockLoadSetters.cpp
+++ b/code/components/gta-core-five/src/BlockLoadSetters.cpp
@@ -507,36 +507,34 @@ static hook::cdecl_stub<void(void*, bool)> _kickRender([]
 
 static void (*g_origCtrlInit)(bool, bool);
 
+static uint8_t* ctrlInit_location1 = nullptr;
+static uint8_t* ctrlInit_location3 = nullptr;
+static void* ctrlInit_rti = nullptr;
+
 static void OnCtrlInit(bool isWindowed, bool isExclusive)
 {
 	uint8_t orig1, orig2, orig3;
 
-	static auto location1 = hook::get_pattern<uint8_t>("E8 ? ? ? ? 84 C0 74 1F 48 8B 05 ? ? ? ? 48 8B 40", 7);
-
 	{
-		orig1 = location1[0];
-		orig2 = location1[-0x5F];
-		hook::put<uint8_t>(location1, 0xEB);
-		hook::put<uint8_t>(location1 - 0x5F, 0xEB);
+		orig1 = ctrlInit_location1[0];
+		orig2 = ctrlInit_location1[-0x5F];
+		hook::put<uint8_t>(ctrlInit_location1, 0xEB);
+		hook::put<uint8_t>(ctrlInit_location1 - 0x5F, 0xEB);
 	}
 
-	static auto location3 = hook::get_pattern<uint8_t>("33 D2 89 7C 24 44 66 C7", -0x37);
-
 	{
-		orig3 = *location3;
-		hook::return_function(location3);
+		orig3 = *ctrlInit_location3;
+		hook::return_function(ctrlInit_location3);
 	}
 
-	static auto rti = hook::get_address<void*>(hook::get_pattern("E8 ? ? ? ? 45 33 FF 44 38 7B 0D 74 0E", -6));
-
 	_setRenderDeleg();
-	_kickRender(rti, true);
+	_kickRender(ctrlInit_rti, true);
 
 	OnMainGameFrame.Connect([orig1, orig2, orig3]
 	{
-		hook::put<uint8_t>(location1, orig1);
-		hook::put<uint8_t>(location1 - 0x5F, orig2);
-		hook::put<uint8_t>(location3, orig3);
+		hook::put<uint8_t>(ctrlInit_location1, orig1);
+		hook::put<uint8_t>(ctrlInit_location1 - 0x5F, orig2);
+		hook::put<uint8_t>(ctrlInit_location3, orig3);
 	});
 
 	// orig
@@ -782,6 +780,10 @@ static HookFunction hookFunction([] ()
 
 	// kick renderer before slow dinput code
 	{
+		ctrlInit_location1 = hook::get_pattern<uint8_t>("E8 ? ? ? ? 84 C0 74 1F 48 8B 05 ? ? ? ? 48 8B 40", 7);
+		ctrlInit_location3 = hook::get_pattern<uint8_t>("33 D2 89 7C 24 44 66 C7", -0x37);
+		ctrlInit_rti = hook::get_address<void*>(hook::get_pattern("E8 ? ? ? ? 45 33 FF 44 38 7B 0D 74 0E", -6));
+
 		auto location = hook::get_pattern("74 0B E8 ? ? ? ? 8A 0D ? ? ? ? 80", 2);
 		hook::set_call(&g_origCtrlInit, location);
 		hook::call(location, OnCtrlInit);
diff --git a/code/components/gta-core-five/src/GameInput.cpp b/code/components/gta-core-five/src/GameInput.cpp
index 73ea78d27c..f90c00687a 100644
--- a/code/components/gta-core-five/src/GameInput.cpp
+++ b/code/components/gta-core-five/src/GameInput.cpp
@@ -4,6 +4,7 @@
 #include <CoreConsole.h>
 
 #include <RageParser.h>
+#include <RageInput.h>
 
 #include <gameSkeleton.h>
 #include <ICoreGameInit.h>
@@ -27,17 +28,17 @@ namespace rage
 {
 	struct ioInputSource
 	{
-		uint32_t source;
+		rage::ioMapperSource source;
 		uint32_t parameter;
 		int unk;
 
 		inline ioInputSource()
-			: source(0), parameter(0), unk(-1)
+			: source(IOMS_KEYBOARD), parameter(0), unk(-1)
 		{
 
 		}
 
-		inline ioInputSource(uint32_t source, uint32_t parameter, int unk)
+		inline ioInputSource(rage::ioMapperSource source, uint32_t parameter, int unk)
 			: source(source), parameter(parameter), unk(unk)
 		{
 
@@ -87,6 +88,22 @@ namespace rage
 		void UpdateMap(int max_k, const ioInputSource& info, ioValue& value);
 
 		void RemoveDeviceMappings(ioValue& value, int a3);
+
+	public:
+		//
+		// Given a source/parameter, gets the parameter to use when serializing a control.
+		//
+		static uint32_t GetParameterIndex(rage::ioMapperSource source, uint32_t parameter);
+
+		//
+		// Given a source/serialized parameter, gets the native parameter to use.
+		//
+		static uint32_t UngetParameterIndex(rage::ioMapperSource source, uint32_t parameter);
+
+		//
+		// Ensure the <source, parameter> pairing form a valid matching.
+		//
+		static bool ValidateParameter(rage::ioMapperSource source, uint32_t parameter);
 	};
 }
 
@@ -160,15 +177,12 @@ uint32_t ControlSourceToMapperSource(uint32_t source)
 	return _controlSourceToMapperSource(source);
 }
 
-static hook::cdecl_stub<uint32_t(uint32_t, uint32_t)> _getParameterIndex([]()
+static hook::cdecl_stub<uint32_t(rage::ioMapperSource, uint32_t)> _getParameterIndex([]()
 {
 	return hook::get_pattern("83 F9 01 74 2C 0F 8E E8 00 00 00", -0xF);
 });
 
-//
-// Given a source/parameter, gets the parameter to use when serializing a control.
-//
-uint32_t GetParameterIndex(uint32_t source, uint32_t parameter)
+uint32_t rage::ioMapper::GetParameterIndex(rage::ioMapperSource source, uint32_t parameter)
 {
 	return _getParameterIndex(source, parameter);
 }
@@ -178,14 +192,114 @@ static hook::cdecl_stub<uint32_t(uint32_t, uint32_t)> _ungetParameterIndex([]()
 	return hook::get_pattern("74 28 7E 36 83 F9", -0x12);
 });
 
-//
-// Given a source/serialized parameter, gets the native parameter to use.
-//
-uint32_t UngetParameterIndex(uint32_t source, uint32_t parameter)
+uint32_t rage::ioMapper::UngetParameterIndex(rage::ioMapperSource source, uint32_t parameter)
 {
 	return _ungetParameterIndex(source, parameter);
 }
 
+// GH-1577: Sanitize invalid mapper/parameter pairings. In the reported case
+// IOMS_PAD_DIGITALBUTTON may cause invalid keys to overflow into being valid.
+// This function attempts to rebuild the switch statement from _getParameterIndex.
+bool rage::ioMapper::ValidateParameter(rage::ioMapperSource source, uint32_t parameter)
+{
+	switch (source)
+	{
+		case IOMS_KEYBOARD:
+			return (parameter & IOMT_KEYBOARD) == IOMT_KEYBOARD;
+		case IOMS_MOUSE_ABSOLUTEAXIS:
+			return (parameter & IOMT_MOUSE_AXIS) == IOMT_MOUSE_AXIS;
+		case IOMS_MOUSE_CENTEREDAXIS:
+		case IOMS_MOUSE_RELATIVEAXIS:
+		case IOMS_MOUSE_SCALEDAXIS:
+		case IOMS_MOUSE_NORMALIZED:
+			return (parameter & IOMT_MOUSE_AXIS) == IOMT_MOUSE_AXIS;
+		case IOMS_MOUSE_WHEEL:
+			return (parameter & IOMT_MOUSE_WHEEL) == IOMT_MOUSE_WHEEL;
+		case IOMS_MOUSE_BUTTON:
+			return (parameter & IOMT_MOUSE_BUTTON) == IOMT_MOUSE_BUTTON;
+		case IOMS_MOUSE_BUTTONANY:
+		case IOMS_PAD_DIGITALBUTTONANY:
+			return true;
+		case IOMS_PAD_DIGITALBUTTON:
+		case IOMS_PAD_DEBUGBUTTON:
+			return (parameter & IOMT_PAD_BUTTON) == IOMT_PAD_BUTTON;
+		case IOMS_PAD_ANALOGBUTTON:
+			return (parameter & IOMT_PAD_INDEX) == IOMT_PAD_INDEX;
+		case IOMS_PAD_AXIS:
+			return (parameter & IOMT_PAD_AXIS) == IOMT_PAD_AXIS;
+		case IOMS_JOYSTICK_BUTTON:
+			return (parameter & IOMT_JOYSTICK_BUTTON) == IOMT_JOYSTICK_BUTTON;
+		case IOMS_JOYSTICK_AXIS:
+		case IOMS_JOYSTICK_IAXIS:
+		case IOMS_JOYSTICK_AXIS_NEGATIVE:
+		case IOMS_JOYSTICK_AXIS_POSITIVE:
+			return (parameter & IOMT_JOYSTICK_AXIS) == IOMT_JOYSTICK_AXIS;
+		case IOMS_JOYSTICK_POV:
+		case IOMS_JOYSTICK_POV_AXIS:
+			return (parameter & IOMT_JOYSTICK_POV) == IOMT_JOYSTICK_POV;
+		case IOMS_MKB_AXIS:
+			return (parameter & IOMT_KEYBOARD) == IOMT_KEYBOARD
+				   || (parameter & IOMT_MOUSE_BUTTON) == IOMT_MOUSE_BUTTON
+				   || (parameter & IOMT_MOUSE_WHEEL) == IOMT_MOUSE_WHEEL;
+		case IOMS_TOUCHPAD_ABSOLUTE_AXIS:
+		case IOMS_TOUCHPAD_CENTERED_AXIS:
+			return (parameter & IOMT_MOUSE_AXIS) == IOMT_MOUSE_AXIS;
+		default:
+			return false;
+	}
+}
+
+class CControl
+{
+public:
+	inline static size_t kInputOffset;
+	inline static size_t kMapperOffset;
+
+public:
+	inline rage::ioValue* GetValue(int keyIndex)
+	{
+		auto controlPtr = (uint8_t*)this;
+		return (rage::ioValue*)&controlPtr[kInputOffset + (keyIndex * 72)];
+	}
+
+	inline rage::ioMapper* GetInputMappers()
+	{
+		auto location = reinterpret_cast<char*>(this) + kMapperOffset;
+		return reinterpret_cast<rage::ioMapper*>(location);
+	}
+
+	rage::ioInputSource* GetBinding(rage::ioInputSource& outParam, int controlIdx, int unkN1, bool secondaryBinding, bool fallback);
+};
+
+class CControlMgr
+{
+public:
+	inline static void* Controls;
+	inline static size_t kControlSize;
+
+public:
+	static inline CControl* GetPlayerControls()
+	{
+		return reinterpret_cast<CControl*>(Controls);
+	}
+
+	static inline CControl* GetFrontendControls()
+	{
+		auto location = (static_cast<char*>(Controls)) + kControlSize;
+		return reinterpret_cast<CControl*>(location);
+	}
+};
+
+static hook::thiscall_stub<rage::ioInputSource*(CControl*, rage::ioInputSource*, int, int, bool, bool)> _control_getBinding([]()
+{
+	return hook::get_call(hook::get_pattern("40 88 6C 24 28 40 88 6C 24 20 E8 ? ? ? ? 41 8D", 10));
+});
+
+rage::ioInputSource* CControl::GetBinding(rage::ioInputSource& outParam, int controlIdx, int unkN1, bool secondaryBinding, bool fallback)
+{
+	return _control_getBinding(this, &outParam, controlIdx, unkN1, secondaryBinding, fallback);
+}
+
 class Button
 {
 public:
@@ -195,7 +309,7 @@ class Button
 
 	void UpdateOnControl();
 
-	void SetFromControl(void* control, int keyIndex);
+	void SetFromControl(CControl* control, int keyIndex);
 
 private:
 	std::string m_name;
@@ -218,13 +332,13 @@ Button::Button(const std::string& name)
 
 	m_downCommand = std::make_unique<ConsoleCommand>("+" + name, [this]()
 	{
-		rage::ioInputSource source{ 0, 1, -4 }; // keyboard?
+		rage::ioInputSource source{ rage::IOMS_KEYBOARD, 1, -4 }; // keyboard?
 		UpdateIoValues(1.0f, source);
 	});
 
 	m_upCommand = std::make_unique<ConsoleCommand>("-" + name, [this]()
 	{
-		rage::ioInputSource source{ 0, 1, -4 }; // keyboard?
+		rage::ioInputSource source{ rage::IOMS_KEYBOARD, 1, -4 }; // keyboard?
 		UpdateIoValues(0.0f, source);
 	});
 }
@@ -242,7 +356,7 @@ void Button::UpdateOnControl()
 		{
 			if (copy)
 			{
-				rage::ioInputSource source{ 0, 1, -4 }; // keyboard?
+				rage::ioInputSource source{ rage::IOMS_KEYBOARD, 1, -4 };
 
 				if (!copy->IsDown(0.5f, rage::ioValue::NO_DEAD_ZONE))
 				{
@@ -253,11 +367,9 @@ void Button::UpdateOnControl()
 	}
 }
 
-void Button::SetFromControl(void* control, int keyIndex)
+void Button::SetFromControl(CControl* control, int keyIndex)
 {
-	auto controlPtr = (uint8_t*)control;
-
-	rage::ioValue* value = (rage::ioValue*) & controlPtr[33704 + (keyIndex * 72)];
+	rage::ioValue* value = control->GetValue(keyIndex);
 
 	for (auto& copy : m_ioValueCopies)
 	{
@@ -296,7 +408,7 @@ class Binding
 
 	bool IsActive() const;
 
-	inline void SetBinding(std::tuple<int, int> binding)
+	inline void SetBinding(std::tuple<rage::ioMapperSource, int> binding)
 	{
 		m_binding = binding;
 	}
@@ -335,7 +447,7 @@ class Binding
 
 	std::string m_tag;
 
-	std::tuple<int, int> m_binding;
+	std::tuple<rage::ioMapperSource, int> m_binding;
 
 	std::set<rage::ioMapper*> m_mappers;
 };
@@ -351,8 +463,6 @@ Binding::~Binding()
 	Unmap();
 }
 
-static void* g_control;
-static uint32_t g_mapperOffset;
 static std::multiset<std::string, std::less<>> g_downSet;
 
 static hook::cdecl_stub<bool(int)> _isMenuActive([]
@@ -365,11 +475,6 @@ static hook::cdecl_stub<bool()> _isTextInputBoxActive([]
 	return hook::get_call(hook::get_pattern("E8 ? ? ? ? 40 84 FF 74 15 E8", 10));
 });
 
-static hook::thiscall_stub<rage::ioInputSource*(void* control, rage::ioInputSource* outParam, int controlIdx, int unkN1, bool secondaryBinding, bool)> _control_getBinding([]()
-{
-	return hook::get_call(hook::get_pattern("40 88 6C 24 28 40 88 6C 24 20 E8 ? ? ? ? 41 8D", 10));
-});
-
 bool IsTagActive(const std::string& tag);
 
 void Binding::Unmap()
@@ -396,7 +501,7 @@ bool Binding::PreUpdate(rage::ioMapper* mapper)
 		return false;
 	}
 
-	if (Instance<ICoreGameInit>::Get()->GetGameLoaded() && mapper == (rage::ioMapper*)((char*)g_control + g_mapperOffset) && !_isMenuActive(1))
+	if (Instance<ICoreGameInit>::Get()->GetGameLoaded() && mapper == CControlMgr::GetPlayerControls()->GetInputMappers() && !_isMenuActive(1))
 	{
 		UpdateMap(mapper);
 	}
@@ -530,7 +635,7 @@ class BindingManager
 
 	void Update(rage::ioMapper* mapper, uint32_t time);
 
-	std::shared_ptr<Binding> Bind(int source, int parameter, const std::string& command);
+	std::shared_ptr<Binding> Bind(rage::ioMapperSource source, int parameter, const std::string& command);
 
 	inline auto& GetBindings()
 	{
@@ -549,14 +654,14 @@ class BindingManager
 	std::unique_ptr<ConsoleCommand> m_unbindAllCommand;
 	std::unique_ptr<ConsoleCommand> m_listBindsCommand;
 
-	std::multimap<std::tuple<int, int>, std::shared_ptr<Binding>> m_bindings;
+	std::multimap<std::tuple<rage::ioMapperSource, int>, std::shared_ptr<Binding>> m_bindings;
 
 	std::list<std::unique_ptr<Button>> m_buttons;
 
 	concurrency::concurrent_queue<std::function<void()>> m_queue;
 };
 
-static std::map<std::string, int, console::IgnoreCaseLess> ioSourceMap;
+static std::map<std::string, rage::ioMapperSource, console::IgnoreCaseLess> ioSourceMap;
 static std::map<std::string, int, console::IgnoreCaseLess> ioParameterMap;
 
 void BindingManager::Initialize()
@@ -568,7 +673,7 @@ void BindingManager::Initialize()
 			rage::ioInputSource source;
 			binding.second->GetBinding(source);
 
-			auto parameterIndex = _getParameterIndex(source.source, source.parameter);
+			auto parameterIndex = rage::ioMapper::GetParameterIndex(source.source, source.parameter);
 
 			std::string ioSource = "";
 			std::string ioParameter = "";
@@ -597,7 +702,7 @@ void BindingManager::Initialize()
 
 	auto bind = [=](const std::string& ioSourceName, const std::string& ioParameterName, const std::string& commandString, const std::string& tag)
 	{
-		int ioSource;
+		rage::ioMapperSource ioSource;
 
 		{
 			auto it = ioSourceMap.find(ioSourceName);
@@ -621,8 +726,13 @@ void BindingManager::Initialize()
 				console::Printf("IO", "Invalid key name %s\n", ioParameterName.c_str());
 				return;
 			}
+			else if (!rage::ioMapper::ValidateParameter(ioSource, it->second))
+			{
+				console::Printf("IO", "Invalid I/O parameter pairing: <%s, %s>\n", ioSourceName, ioParameterName);
+				return;
+			}
 
-			ioParameter = _ungetParameterIndex(ioSource, it->second);
+			ioParameter = rage::ioMapper::UngetParameterIndex(ioSource, it->second);
 		}
 
 		for (const auto& binding : m_bindings)
@@ -657,7 +767,7 @@ void BindingManager::Initialize()
 
 	m_unbindCommand = std::make_unique<ConsoleCommand>("unbind", [=](const std::string& ioSourceName, const std::string& ioParameterName)
 	{
-		int ioSource;
+		rage::ioMapperSource ioSource;
 
 		{
 			auto it = ioSourceMap.find(ioSourceName);
@@ -681,8 +791,13 @@ void BindingManager::Initialize()
 				console::Printf("IO", "Invalid key name %s\n", ioParameterName.c_str());
 				return;
 			}
+			else if (!rage::ioMapper::ValidateParameter(ioSource, it->second))
+			{
+				console::Printf("IO", "Invalid I/O parameter pairing: <%s, %s>\n", ioSourceName, ioParameterName);
+				return;
+			}
 
-			ioParameter = _ungetParameterIndex(ioSource, it->second);
+			ioParameter = rage::ioMapper::UngetParameterIndex(ioSource, it->second);
 		}
 
 		m_bindings.erase({ ioSource, ioParameter });
@@ -696,7 +811,7 @@ void BindingManager::Initialize()
 	});
 }
 
-std::shared_ptr<Binding> BindingManager::Bind(int ioSource, int ioParameter, const std::string& commandString)
+std::shared_ptr<Binding> BindingManager::Bind(rage::ioMapperSource ioSource, int ioParameter, const std::string& commandString)
 {
 	for (auto it = m_bindings.begin(); it != m_bindings.end(); )
 	{
@@ -819,7 +934,7 @@ void BindingManager::OnGameInit()
 			std::string_view thisName = *name;
 			thisName = thisName.substr(thisName.find_first_of('_') + 1);
 
-			ioSourceMap[std::string(thisName)] = field->index;
+			ioSourceMap[std::string(thisName)] = static_cast<rage::ioMapperSource>(field->index);
 
 			name++;
 		}
@@ -843,16 +958,8 @@ void BindingManager::CreateButtons()
 			std::transform(thisNameStr.begin(), thisNameStr.end(), thisNameStr.begin(), ToLower);
 
 			auto button = std::make_unique<Button>(thisNameStr);
-			button->SetFromControl(g_control, field->index);
-
-			if (!xbr::IsGameBuildOrGreater<2060>())
-			{
-				button->SetFromControl((char*)g_control + 0x21A98, field->index); // 1604
-			}
-			else
-			{
-				button->SetFromControl((char*)g_control + 0x21B78, field->index); // 2198
-			}
+			button->SetFromControl(CControlMgr::GetPlayerControls(), field->index);
+			button->SetFromControl(CControlMgr::GetFrontendControls(), field->index);
 
 			m_buttons.push_back(std::move(button));
 
@@ -869,7 +976,6 @@ void BindingManager::UpdateButtons()
 	}
 }
 
-static size_t g_controlSize;
 static BindingManager bindingManager;
 
 static std::unordered_set<std::string> g_activeTags;
@@ -943,7 +1049,7 @@ namespace game
 
 		if (!ioms.empty() && !ioParam.empty())
 		{
-			int ioSource;
+			rage::ioMapperSource ioSource;
 
 			{
 				auto it = ioSourceMap.find(ioms);
@@ -967,8 +1073,13 @@ namespace game
 					console::Printf("IO", "Invalid key name %s\n", ioParam);
 					return;
 				}
+				else if (!rage::ioMapper::ValidateParameter(ioSource, it->second))
+				{
+					console::Printf("IO", "Invalid I/O parameter pairing: <%s, %s>\n", ioms, ioParam);
+					return;
+				}
 
-				ioParameter = _ungetParameterIndex(ioSource, it->second);
+				ioParameter = rage::ioMapper::UngetParameterIndex(ioSource, it->second);
 			}
 
 			for (auto& binding : bindingManager.GetBindings())
@@ -986,7 +1097,7 @@ namespace game
 	bool IsInputSourceDown(const rage::ioInputSource& controlData)
 	{
 		// mouse?
-		if (controlData.source == 7)
+		if (controlData.source == rage::IOMS_MOUSE_BUTTON)
 		{
 			return InputHook::IsMouseButtonDown(controlData.parameter);
 		}
@@ -998,8 +1109,8 @@ namespace game
 	{
 		rage::ioInputSource controlData;
 		rage::ioInputSource controlDataSecondary;
-		_control_getBinding(g_control, &controlData, control, -1, false, false);
-		_control_getBinding(g_control, &controlDataSecondary, control, -4, true, false);
+		CControlMgr::GetPlayerControls()->GetBinding(controlData, control, -1, false, false);
+		CControlMgr::GetPlayerControls()->GetBinding(controlDataSecondary, control, -4, true, false);
 
 		return IsInputSourceDown(controlData) || IsInputSourceDown(controlDataSecondary);
 	}
@@ -1061,7 +1172,7 @@ static void* GetBindingForControl(void* control, rage::ioInputSource* outBinding
 	if (controlId & 0x80000000)
 	{
 		outBinding->parameter = -1;
-		outBinding->source = -1;
+		outBinding->source = rage::IOMS_UNDEFINED;
 		outBinding->unk = -1;
 
 		auto controlRef = GetRegisteredBindingByHash(controlId);
@@ -1191,16 +1302,16 @@ static void MapFuncHook(void* a1, uint32_t controlIdx, void* a3, void* a4)
 void UpdateButtonPlumbing()
 {
 	rage::ioInputSource controlDatas[2];
-	_control_getBinding(g_control, &controlDatas[0], 249 /* INPUT_PUSH_TO_TALK */, -1, false, false);
-	_control_getBinding(g_control, &controlDatas[1], 249 /* INPUT_PUSH_TO_TALK */, -1, true, false);
+	CControlMgr::GetPlayerControls()->GetBinding(controlDatas[0], rage::INPUT_PUSH_TO_TALK, -1, false, false);
+	CControlMgr::GetPlayerControls()->GetBinding(controlDatas[1], rage::INPUT_PUSH_TO_TALK, -1, true, false);
 
 	auto mapBypass = [](rage::ioInputSource& controlData)
 	{
 		InputHook::ControlBypass bypass = { 0 };
-
-		if (controlData.source == 0 /* IOMS_KEYBOARD */ || controlData.source == 7 /* IOMS_MOUSE_BUTTON */)
+
+		if (controlData.source == rage::IOMS_KEYBOARD || controlData.source == rage::IOMS_MOUSE_BUTTON)
 		{
-			bypass.isMouse = controlData.source == 7;
+			bypass.isMouse = controlData.source == rage::IOMS_MOUSE_BUTTON;
 			bypass.ctrlIdx = controlData.parameter;
 		}
 
@@ -1232,7 +1343,7 @@ static HookFunction hookFunction([]()
 			rage::ioInputSource source;
 			binding.second->GetBinding(source);
 
-			auto parameterIndex = _getParameterIndex(source.source, source.parameter);
+			auto parameterIndex = rage::ioMapper::GetParameterIndex(source.source, source.parameter);
 
 			std::string ioSource = "";
 			std::string ioParameter = "";
@@ -1302,8 +1413,6 @@ static HookFunction hookFunction([]()
 	MH_CreateHook(hook::get_pattern("33 DB 4C 8B D1 48 89 5E 50", -0x27), HandleMappingConflicts, (void**)&g_origHandleMappingConflicts);
 	MH_EnableHook(MH_ALL_HOOKS);
 
-	g_mapperOffset = *hook::get_pattern<uint32_t>("48 63 04 B0 4C 8D 89 ? ? 00 00 B9 BF", 7);
-
 	// hacks for unknown array
 	{
 		auto location = hook::get_pattern<char>("48 8D 0D ? ? ? ? 44 38 34 08", 7);
@@ -1370,6 +1479,10 @@ static HookFunction hookFunction([]()
 	}
 
 	// control
-	g_control = hook::get_address<void*>(hook::get_pattern("74 09 48 8D 05 ? ? ? ? EB 07 48 8D 05", 5));
-	g_controlSize = *hook::get_pattern<int>("E8 ? ? ? ? 48 81 C3 ? ? ? ? 48 FF CF 75 EA", 8);
+	{
+		CControlMgr::Controls = hook::get_address<void*>(hook::get_pattern("74 09 48 8D 05 ? ? ? ? EB 07 48 8D 05", 5));
+		CControlMgr::kControlSize = *hook::get_pattern<int>("E8 ? ? ? ? 48 81 C3 ? ? ? ? 48 FF CF 75 EA", 8);
+		CControl::kMapperOffset = *hook::get_pattern<uint32_t>("48 63 04 B0 4C 8D 89 ? ? 00 00 B9 BF", 7);
+		CControl::kInputOffset = *hook::get_pattern<int>("0F 28 CA 48 8D 14 C0 4C 8D 44 24 ? C7 44 24", 0x1B);
+	}
 });
diff --git a/code/components/gta-core-five/src/PatchPedPropsLimit.cpp b/code/components/gta-core-five/src/PatchPedPropsLimit.cpp
new file mode 100644
index 0000000000..b718c29977
--- /dev/null
+++ b/code/components/gta-core-five/src/PatchPedPropsLimit.cpp
@@ -0,0 +1,107 @@
+#include <StdInc.h>
+#include <Hooking.h>
+#include "CrossBuildRuntime.h"
+
+//
+// Currently, GTA5 has a "soft limit" of 256 global (not per-DLC) ped prop indices (with a maximum index of 0xFF)
+// per anchor per model info (255 slots for `mp_f_freemode_01`, 256 for `mp_m_freemode_01`, etc.). This means that
+// with every single title update for GTA5, the number of "free" slots significantly decreases. Exceeding the
+// limit of 256 will lead to the "overflow" effect, corrupting other ped props. This happens because some specific
+// game functions expect the prop index argument to be an 8-bit integer. However, it doesn't seem to be explicitly
+// intended, as most functions expect 32-bit integers. This patch set is meant to "fix" this inconsistency and
+// make the game work fine with 32-bit global ped prop indices.
+//
+
+static HookFunction hookFunction([]()
+{
+	{
+		auto location = hook::get_pattern<char>("48 8B CD E8 ? ? ? ? 0F B6 D0 3B DA", 8);
+		hook::nop(location, 3); // nop "movzx edx, al" instruction.
+		hook::put<uint16_t>(location, 0xD08B); // put "mov edx, eax" instead.
+	}
+
+	{
+		auto location = hook::get_pattern<char>("0F B6 C8 83 C8 FF 3B D8 7D 04");
+		hook::nop(location, 3); // nop "movzx ecx, al" instruction.
+		hook::put<uint16_t>(location, 0xC88B); // put "mov ecx, eax" instead.
+	}
+
+	if (xbr::IsGameBuildOrGreater<2372>())
+	{
+		auto location = hook::get_pattern<char>("33 D2 E8 ? ? ? ? 0F B6 C0 3B D8", 7);
+		hook::nop(location, 3); // nop "movzx eax, al" so it will use a 32-bit register.
+	}
+	else
+	{
+		auto location = hook::get_pattern<char>("0F B6 D0 39 53 28 7C 0F");
+		hook::nop(location, 3); // nop "movzx edx, al" instruction.
+		hook::put<uint16_t>(location, 0xD08B); // put "mov edx, eax" instead.
+	}
+
+	if (xbr::IsGameBuildOrGreater<2372>())
+	{
+		auto location = hook::get_pattern<char>("33 D2 E8 ? ? ? ? 0F B6 C0 3B F8 7D 07", 7);
+		hook::nop(location, 3); // nop "movzx eax, al" so it will use 32-bit register.
+	}
+	else
+	{
+		auto location = hook::get_pattern<char>("41 3B F8 7D 07 89 7B 18", -4);
+		hook::nop(location, 4); // nop "movzx r8d, al" instruction.
+		hook::put<uint32_t>(location, 0x90C08B44); // put "mov r8d, eax" and "nop" instead.	
+	}
+
+	{
+		auto location = hook::get_pattern<char>("44 0F B6 C0 40 0F B6 D6");
+		hook::put<uint32_t>(location, 0x90C08B44); // replace "movzx r8d, al" with "mov r8d, eax" and "nop".
+	}
+
+	{
+		auto location = hook::get_pattern<char>("44 0F B6 C0 0F B6 D3 48 8B CD E8");
+		hook::put<uint32_t>(location, 0x90C08B44); // replace "movzx r8d, al" with "mov r8d, eax" and "nop".
+	}
+
+	{
+		auto matches = hook::pattern("45 0F B6 C4 41 0F B6 D6 E8").count(2);
+		for (auto i = 0; i < (int)matches.size(); i++)
+		{
+			char* location = matches.get(i).get<char>(0);
+			hook::put<uint32_t>(location, 0x90C48B45); // replace "movzx r8d, r12b" with "mov r8d, r12d" and "nop".
+		}
+	}
+
+	{
+		auto location = hook::get_pattern<char>("45 0F B6 C0 0F B6 D2 41 8B D9 E8");
+		hook::nop(location, 4); // nop "movzx r8d, r8b" so it will use 32-bit register.
+	}
+
+	{
+		auto location = hook::get_pattern<char>("44 0F B6 F8 44 0F B6 E6 49 8B CE 45 8B C7");
+		hook::put<uint32_t>(location, 0x90F88B44); // replace "movzx r15d, al" with "mov r15d, eax" and "nop".
+	}
+
+	{
+		auto matches =  hook::pattern("45 33 C9 44 8A C5 40 8A D6 48 8B CF").count(2);
+		for (auto i = 0; i < (int)matches.size(); i++)
+		{
+			char* location = matches.get(i).get<char>(3);
+			constexpr uint8_t payload[] = { 0x44, 0x8B, 0xC5 };
+			memcpy(location, payload, sizeof(payload)); // replace "mov r8b, bpl" with "mov r8d, ebp".
+		}
+	}
+
+	{
+		auto matches =  hook::pattern("41 B9 ? 00 00 00 44 8A C5 40 8A D6").count(4);
+		for (auto i = 0; i < (int)matches.size(); i++)
+		{
+			char* location = matches.get(i).get<char>(6);
+			constexpr uint8_t payload[] = { 0x44, 0x8B, 0xC5 };
+			memcpy(location, payload, sizeof(payload)); // replace "mov r8b, bpl" with "mov r8d, ebp".
+		}
+	}
+
+	{
+		auto location = hook::get_pattern<char>("45 8A CF 44 8A C7 8A D3 48", 3);
+		constexpr uint8_t payload[] = { 0x44, 0x8B, 0xC7 };
+		memcpy(location, payload, sizeof(payload)); // replace "mov r8b, dil" with "mov r8d, edi".
+	}
+});
diff --git a/code/components/gta-core-rdr3/src/PatchTrainTrackFileOverride.cpp b/code/components/gta-core-rdr3/src/PatchTrainTrackFileOverride.cpp
new file mode 100644
index 0000000000..9f75f06009
--- /dev/null
+++ b/code/components/gta-core-rdr3/src/PatchTrainTrackFileOverride.cpp
@@ -0,0 +1,69 @@
+#include <StdInc.h>
+#include <Hooking.h>
+#include <Hooking.Stubs.h>
+#include <Hooking.Patterns.h>
+
+//
+// The tracks that vehicles like trains and the Saint Denis trolley follow, as well as the cables dangling
+// above the trolley's route, are defined in a plain-text format stored in several *.dat files. These files
+// are in turn referenced by filepath by an XML file - traintracks.xml for vehicles, trolleyCableTracks.xml for the cables.
+// 
+// There is currently no way to fully replace the track data within the *.dat files, nor to modify or override the XML files.
+// This patch introduces a way to replace the XML files, allowing for fully custom rail (and trolley cable?) networks.
+// We intercept all calls to LoadTrackXML(), and if one of the override filepaths is valid, we use it instead of the default
+// path. To set these override filenames, the resource must define either (or both) of the following statements:
+// 
+// * replace_traintrack_file 'path/to/traintracks.xml'
+// 
+// * replace_trolley_cable_file 'path/to/trolleyCableTracks.xml'
+//
+
+#define DEFAULT_TRACK_FILE  "common:/data/levels/rdr3/traintracks.xml"
+#define DEFAULT_CABLES_FILE "common:/data/levels/rdr3/trolleyCableTracks.xml"
+
+static std::string g_overrideTrainTrackFilePath   = "";
+static std::string g_overrideTrolleyCableFilePath = "";
+
+namespace streaming
+{
+	// Sets a resource override for traintracks.xml and enables train track replacement.
+	void DLL_EXPORT SetTrainTrackFilePath(const std::string& path)
+	{
+		g_overrideTrainTrackFilePath = path;
+	}
+
+	// Sets a resource override for trolleyCableTracks.xml and enables trolley cable replacement.
+	void DLL_EXPORT SetTrolleyCableFilePath(const std::string& path)
+	{
+		g_overrideTrolleyCableFilePath = path;
+	}
+}
+
+typedef __int64 CTrainTrackPool; // Typedef for clarity on LoadTrackXML()'s parameters.
+
+static void (*g_origLoadTrackXML)(const char*, CTrainTrackPool*);
+static void LoadTrackXML(const char* origXmlFileName, CTrainTrackPool* dstPool)
+{
+    if (!g_overrideTrainTrackFilePath.empty() && strcmp(origXmlFileName, DEFAULT_TRACK_FILE) == 0)
+    {
+		trace("Replacing default traintracks.xml with %s\n", g_overrideTrainTrackFilePath.data());
+        g_origLoadTrackXML(g_overrideTrainTrackFilePath.data(), dstPool);
+    }
+	else if (!g_overrideTrolleyCableFilePath.empty() && strcmp(origXmlFileName, DEFAULT_CABLES_FILE) == 0)
+	{
+		trace("Replacing default trolleyCableTracks.xml with %s\n", g_overrideTrolleyCableFilePath.data());
+		g_origLoadTrackXML(g_overrideTrolleyCableFilePath.data(), dstPool);
+	}
+	else
+	{
+		g_origLoadTrackXML(origXmlFileName, dstPool);
+	}
+}
+
+static HookFunction hookFunction([]()
+{
+	{
+        auto location = hook::get_call(hook::get_pattern("E8 ? ? ? ? 48 8D 0D ? ? ? ? E8 ? ? ? ? EB 44"));
+        g_origLoadTrackXML = hook::trampoline(location, LoadTrackXML);
+	}
+});
diff --git a/code/components/gta-net-five/src/NetHook.cpp b/code/components/gta-net-five/src/NetHook.cpp
index aeeb3aaf25..42ea88eee5 100644
--- a/code/components/gta-net-five/src/NetHook.cpp
+++ b/code/components/gta-net-five/src/NetHook.cpp
@@ -373,16 +373,10 @@ static hook::cdecl_stub<void(int, int, int)> hostGame([] () -> void*
 	return (void*)hook::get_adjusted(0x1410494F8);
 });
 
+static void** g_networkMgrPtr = nullptr;
 static void* getNetworkManager()
 {
-	static void** networkMgrPtr = nullptr;
-
-	if (networkMgrPtr == nullptr)
-	{
-		networkMgrPtr = hook::get_address<void**>(hook::get_pattern("84 C0 74 2E 48 8B 0D ? ? ? ? 48 8D 54 24 20", 7));
-	}
-
-	return *networkMgrPtr;
+	return *g_networkMgrPtr;
 }
 
 struct OnlineAddress
@@ -1078,6 +1072,9 @@ static HookFunction initFunction([]()
 			doTickNextFrame = false;
 		}
 	});
+
+
+	g_networkMgrPtr = hook::get_address<void**>(hook::get_pattern("84 C0 74 2E 48 8B 0D ? ? ? ? 48 8D 54 24 20", 7));
 });
 
 static uint64_t* g_globalNetSecurityKey;
diff --git a/code/components/gta-streaming-five/src/LoadStreamingFile.cpp b/code/components/gta-streaming-five/src/LoadStreamingFile.cpp
index 45983c7bc2..4e04373202 100644
--- a/code/components/gta-streaming-five/src/LoadStreamingFile.cpp
+++ b/code/components/gta-streaming-five/src/LoadStreamingFile.cpp
@@ -1036,9 +1036,9 @@ static hook::cdecl_stub<void()> _reloadMapIfNeeded([]()
 	return hook::get_pattern("74 1F 48 8D 0D ? ? ? ? E8 ? ? ? ? 48 8D 0D ? ? ? ? E8 ? ? ? ? C6 05", -0xB);
 });
 
+static char* loadChangeSet = nullptr;
 static void ReloadMapStoreNative()
 {
-	static auto loadChangeSet = hook::get_pattern<char>("48 81 EC 50 03 00 00 49 8B F0 4C", -0x18);
 	uint8_t origCode[0x4F3];
 	memcpy(origCode, loadChangeSet, sizeof(origCode));
 
@@ -3301,6 +3301,8 @@ DLL_IMPORT extern fwEvent<> PreSetupLoadingScreens;
 static HookFunction hookFunction([]()
 {
 #ifdef GTA_FIVE
+	loadChangeSet = hook::get_pattern<char>("48 81 EC 50 03 00 00 49 8B F0 4C", -0x18);
+
 	PreSetupLoadingScreens.Connect([]()
 	{
 		FlushCustomAssets();
diff --git a/code/components/gta-streaming-five/src/PatchPackfileLimit.cpp b/code/components/gta-streaming-five/src/PatchPackfileLimit.cpp
index 3ea79dc816..fb475e0ba5 100644
--- a/code/components/gta-streaming-five/src/PatchPackfileLimit.cpp
+++ b/code/components/gta-streaming-five/src/PatchPackfileLimit.cpp
@@ -65,47 +65,41 @@ static void SetStreamingInterface(char* si)
 }
 
 static void(*g_origStreamerTick)(void*, void*);
-
+static int32_t* g_CustomStreamerTickLoc = nullptr;
 static void CustomStreamerTick(void* a1, void* a2)
 {
-	static auto patternLoc = hook::get_pattern<int32_t>("4D 8B A4 C7 ? ? ? ? 4C 8D 45 58 49 8B 04 24", 4);
-
-	auto oldLoc = *patternLoc;
-	*patternLoc = (intptr_t)rage__fiCollection__sm_Collections - hook::get_adjusted(0x140000000);
+	auto oldLoc = *g_CustomStreamerTickLoc;
+	*g_CustomStreamerTickLoc = (intptr_t)rage__fiCollection__sm_Collections - hook::get_adjusted(0x140000000);
 
 	g_origStreamerTick(a1, a2);
 
-	*patternLoc = oldLoc;
+	*g_CustomStreamerTickLoc = oldLoc;
 }
 
 static void*(*g_origQueueStrTask)(uint32_t a1, void* a2, int a3, int a4, void* a5, void* a6, void* a7, uint32_t a8, void* a9, int a10);
-
+static int32_t* g_CustomQueueStrTaskLoc = nullptr;
 static void* CustomQueueStrTask(uint32_t a1, void* a2, int a3, int a4, void* a5, void* a6, void* a7, uint32_t a8, void* a9, int a10)
 {
-	static auto patternLoc = hook::get_pattern<int32_t>("4C 8B BC C1 ? ? ? ? 4D 85 FF 0F 84", 4);
-
-	auto oldLoc = *patternLoc;
-	*patternLoc = (intptr_t)rage__fiCollection__sm_Collections - hook::get_adjusted(0x140000000);
+	auto oldLoc = *g_CustomQueueStrTaskLoc;
+	*g_CustomQueueStrTaskLoc = (intptr_t)rage__fiCollection__sm_Collections - hook::get_adjusted(0x140000000);
 
 	auto rv = g_origQueueStrTask(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10);
 
-	*patternLoc = oldLoc;
+	*g_CustomQueueStrTaskLoc = oldLoc;
 
 	return rv;
 }
 
 static void*(*g_origQueueSemaTask)(uint32_t a1, void* a2, int a3, int a4, void* a5, uint32_t a6, int a7);
-
+static int32_t* g_CustomQueueSemaTaskLoc = nullptr;
 static void* CustomQueueSemaTask(uint32_t a1, void* a2, int a3, int a4, void* a5, uint32_t a6, int a7)
 {
-	static auto patternLoc = hook::get_pattern<int32_t>("4C 8B BC C1 ? ? ? ? 4D 85 FF 0F 84", 4);
-
-	auto oldLoc = *patternLoc;
-	*patternLoc = (intptr_t)rage__fiCollection__sm_Collections - hook::get_adjusted(0x140000000);
+	auto oldLoc = *g_CustomQueueSemaTaskLoc;
+	*g_CustomQueueSemaTaskLoc = (intptr_t)rage__fiCollection__sm_Collections - hook::get_adjusted(0x140000000);
 
 	auto rv = g_origQueueSemaTask(a1, a2, a3, a4, a5, a6, a7);
 
-	*patternLoc = oldLoc;
+	*g_CustomQueueSemaTaskLoc = oldLoc;
 
 	return rv;
 }
@@ -192,5 +186,9 @@ static HookFunction hookFunction([]()
 		hook::set_call(&g_origSetStreamingInterface, location);
 		hook::call(location, SetStreamingInterface);
 	}
+
+	g_CustomStreamerTickLoc = hook::get_pattern<int32_t>("4D 8B A4 C7 ? ? ? ? 4C 8D 45 58 49 8B 04 24", 4);
+	g_CustomQueueStrTaskLoc = hook::get_pattern<int32_t>("4C 8B BC C1 ? ? ? ? 4D 85 FF 0F 84", 4);
+	g_CustomQueueSemaTaskLoc = hook::get_pattern<int32_t>("4C 8B BC C1 ? ? ? ? 4D 85 FF 0F 84", 4);
 });
 #endif
diff --git a/code/components/gta-streaming-five/src/PatchSkeletonCrash.cpp b/code/components/gta-streaming-five/src/PatchSkeletonCrash.cpp
new file mode 100644
index 0000000000..aab16e9ebf
--- /dev/null
+++ b/code/components/gta-streaming-five/src/PatchSkeletonCrash.cpp
@@ -0,0 +1,172 @@
+#include <StdInc.h>
+
+#include <jitasm.h>
+#include <Hooking.h>
+
+#include <CrossBuildRuntime.h>
+
+#include <DirectXMath.h>
+
+namespace rage
+{
+using Mat34V = DirectX::XMMATRIX;
+
+class crSkeletonData;
+class crSkeleton
+{
+public:
+	crSkeletonData* m_skeletonData;
+	Mat34V* m_parent;
+	Mat34V* m_unknown;
+	Mat34V* m_bones;
+	uint32_t m_boneCount;
+};
+}
+
+static void (*g_getGlobalMatrix)(rage::crSkeleton*, uint32_t, rage::Mat34V*);
+static void GetGlobalMatrix(rage::crSkeleton* skeleton, uint32_t boneIndex, rage::Mat34V* outMatrix)
+{
+	if (skeleton && boneIndex != 0xFFFFFFFF)
+	{
+		g_getGlobalMatrix(skeleton, boneIndex, outMatrix);
+	}
+	else if (skeleton && skeleton->m_parent)
+	{
+		*outMatrix = *skeleton->m_parent;
+	}
+	else
+	{
+		*outMatrix = DirectX::XMMatrixIdentity();
+	}
+}
+
+// Apparently this index parameter is signed: movsxd rax,edx
+static void (*g_getGlobalTransform)(rage::crSkeletonData*, int, rage::Mat34V*, rage::Mat34V*);
+static void GetGlobalTransform(rage::crSkeleton* skeleton, int boneIndex, rage::Mat34V* parent, rage::Mat34V* outMatrix)
+{
+	if (skeleton && boneIndex != -1)
+	{
+		g_getGlobalTransform(skeleton->m_skeletonData, boneIndex, parent, outMatrix);
+	}
+	else
+	{
+		*outMatrix = *parent;
+	}
+}
+
+static bool (*g_getBoneIndexFromId)(rage::crSkeletonData*, uint16_t, int*);
+static bool GetBoneIndexFromId(rage::crSkeleton* skeleton, uint16_t boneId, int* outIndex)
+{
+	if (skeleton)
+	{
+		return g_getBoneIndexFromId(skeleton->m_skeletonData, boneId, outIndex);
+	}
+	else
+	{
+		return false;
+	}
+}
+
+static HookFunction hookFunction([]()
+{
+	// For unknown reasons some entities will have an invalid or unloaded
+	// crSkeleton reference. Most places in game-code sanitize this, however
+	// there are still few places in game-code that do not. Common assembly:
+	//
+	//		xor ecx,ecx
+	//	LABEL:
+	//		mov rcx,[rcx].
+	//
+	// Note, the replay editor paths have not been modified:
+	//  48 8B 09 BA ? ? ? ? E8 ? ? ? ? 83 F8 FF
+	//  48 8B 09 BA ? ? ? ? E8 ? ? ? ? ? 8B
+	//  8B 5D D0 4C 8D 45 E0 8B D3 E8 ? ? ? ? 48 8B 07
+	auto put_call = [](void* address, LPVOID funcStub)
+	{
+		hook::put<uint8_t>(address, 0xE8);
+		hook::put<int>((uintptr_t)address + 1, (intptr_t)funcStub - (intptr_t)hook::get_adjusted(address) - 5);
+	};
+
+	// crSkeleton::_GetGlobalMatrix
+	{
+		std::initializer_list<std::tuple<std::string_view, ptrdiff_t>> list = {
+			{ "4C 8B C7 33 D2 E8 ? ? ? ? 80 67 6D 1F", 0x5 },
+			{ "4C 8D 45 20 41 8B D6 E8 ? ? ? ? 49 8B 4D 58", 0x7 },
+			{ "BA ? ? ? ? 48 8B CB E8 ? ? ? ? 4C 8D 44 24 ? 48 8B CE", 0x17 },
+		};
+
+		LPVOID funcStub = hook::AllocateFunctionStub(GetGlobalMatrix);
+		for (const auto& [pattern, offset] : list)
+		{
+			auto location = hook::get_pattern(pattern, offset);
+			if (g_getGlobalMatrix == nullptr)
+			{
+				hook::set_call(&g_getGlobalMatrix, location);
+			}
+			put_call(location, funcStub);
+		}
+	}
+
+	// crSkeletonData::_GetGlobalTransform
+	{
+		std::initializer_list<std::tuple<std::string_view, ptrdiff_t>> list = {
+			{ "48 8B 09 4C 8D 4D D0 4C 8D 45 80 8B D6 E8", 0xD },
+			{ "48 8B 09 4C 8D 4D D0 4C 8D 45 90 41 8B D6 E8", 0xE },
+			{ "48 8B 09 4C 8D 4D C0 8B D6 E8", 0x9 },
+		};
+
+		LPVOID funcStub = hook::AllocateFunctionStub(GetGlobalTransform);
+		for (const auto& [pattern, offset] : list)
+		{
+			auto location = hook::get_pattern<char>(pattern);
+			if (g_getGlobalTransform == nullptr)
+			{
+				hook::set_call(&g_getGlobalTransform, location + offset);
+			}
+			hook::nop(location, 3); // mov rcx,[rcx]
+			put_call(location + offset, funcStub);
+		}
+	}
+
+	// GH-1563: GET_ENTITY_BONE_INDEX_BY_NAME is also affected by this. The
+	// native is obfuscated so we need to jump to the call.
+	{
+		auto location = hook::get_pattern<char>("48 8B 09 4C 8D 44 24 ? 0F B7 D7 E9");
+		auto jmp_loc = hook::get_address<char*>(location + 0xB + 1);
+		hook::set_call(&g_getBoneIndexFromId, jmp_loc);
+
+		hook::nop(location, 3); // mov rcx,[rcx]
+		hook::call(jmp_loc, GetBoneIndexFromId);
+	}
+
+	// crSkeletonData::_GetBoneIndexFromId
+	{
+		std::initializer_list<std::tuple<std::string_view, ptrdiff_t, uint32_t>> list = {
+			{ "48 8B 09 4C 8D 85 ? ? ? ? 33 D2 E8", 0xC, 4 },
+			{ "48 8B 09 4C 8D 44 24 ? BA ? ? ? ? E8", 0xD, 2 },
+			{ "48 8B 09 4C 8D 44 24 ? 0F B7 ? E8", 0xB, 2 },
+			{ "48 8B 09 4C 8D 45 70 41 0F B7 D7 E8", 0xB, 1 },
+			{ "48 8B 09 4C 8D 44 24 ? 33 D2 E8", 0xA, 1 },
+		};
+
+		LPVOID funcStub = hook::AllocateFunctionStub(GetBoneIndexFromId);
+		for (const auto& [pattern, offset, expectedCount] : list)
+		{
+			auto matches = hook::pattern(pattern).count(expectedCount);
+			for (size_t i = 0; i < matches.size(); ++i)
+			{
+				auto location = matches.get(i).get<char>();
+				hook::nop(location, 3); // mov rcx,[rcx]
+				put_call(location + offset, funcStub);
+			}
+		}
+	}
+
+#if 0
+	// fwEntity::_GetGlobalMatrix: If required hook the dynamic-dispatch bits.
+	{
+		auto location = hook::get_pattern("B2 01 48 8B CF E8 ? ? ? ? 4C 8B C6", 0x26);
+		hook::jump(location, GetGlobalMatrix);
+	}
+#endif
+});
diff --git a/code/components/gta-streaming-five/src/Streaming.cpp b/code/components/gta-streaming-five/src/Streaming.cpp
index fb90057814..a49960d1c9 100644
--- a/code/components/gta-streaming-five/src/Streaming.cpp
+++ b/code/components/gta-streaming-five/src/Streaming.cpp
@@ -89,6 +89,8 @@ namespace rage
 		void RegisterObject(uint32_t* fileIdx, const char* registerName, uint32_t handle, uint32_t collectionId, void* unk, bool unk2, void* unk3, bool unk4);
 	};
 
+	static strStreamingInfoManager* g_strStreamingInfoMgr = nullptr;
+
 	class strStreamingEngine
 	{
 	public:
@@ -107,8 +109,7 @@ namespace rage
 
 	strStreamingInfoManager* strStreamingEngine::GetInfo()
 	{
-		static auto mgr = hook::get_address<strStreamingInfoManager*>(hook::get_pattern<char>("B2 01 48 8B CD 45 8A E0 4D 0F 45 F9 E8", -0x25) + 0xBA);
-		return mgr;
+		return g_strStreamingInfoMgr;
 	}
 }
 
@@ -247,6 +248,8 @@ static HookFunction hookFunction([] ()
 
 	_rage_pgStreamer_ctor = (decltype(_rage_pgStreamer_ctor))hook::get_pattern("48 8B CB 33 D2 41 B8 00 02 00 00 E8", -0x29);
 
+	rage::g_strStreamingInfoMgr = hook::get_address<rage::strStreamingInfoManager*>(hook::get_pattern<char>("B2 01 48 8B CD 45 8A E0 4D 0F 45 F9 E8", -0x25) + 0xBA);
+
 	// start off fiCollection packfiles at 2, not 1
 	hook::put<uint32_t>(hook::get_pattern("41 0F B7 D2 4C 8D"), 0x01528D41); // lea    edx,[r10+0x1]
 });
diff --git a/code/components/rage-device-five/src/fiAssetManager.cpp b/code/components/rage-device-five/src/fiAssetManager.cpp
index 329dd008bd..98b4b1226a 100644
--- a/code/components/rage-device-five/src/fiAssetManager.cpp
+++ b/code/components/rage-device-five/src/fiAssetManager.cpp
@@ -5,10 +5,10 @@
 
 namespace rage
 {
+static fiAssetManager* g_assetManager = nullptr;
 fiAssetManager* fiAssetManager::GetInstance()
 {
-	static auto instance = hook::get_address<fiAssetManager*>(hook::get_pattern("75 62 48 8D 0D ? ? ? ? 48 8B D6 E8", 5));
-	return instance;
+	return g_assetManager;
 }
 
 static hook::thiscall_stub<void(fiAssetManager*, const char*)> _pushFolder([]()
@@ -31,3 +31,8 @@ void fiAssetManager::PopFolder()
 	return _popFolder(this);
 }
 }
+
+static HookFunction hookFunction([]() 
+{
+	rage::g_assetManager = hook::get_address<rage::fiAssetManager*>(hook::get_pattern("75 62 48 8D 0D ? ? ? ? 48 8B D6 E8", 5));
+});
diff --git a/code/components/rage-graphics-five/src/DrawCommands.cpp b/code/components/rage-graphics-five/src/DrawCommands.cpp
index dc1382ab45..5a92b4b77f 100644
--- a/code/components/rage-graphics-five/src/DrawCommands.cpp
+++ b/code/components/rage-graphics-five/src/DrawCommands.cpp
@@ -493,6 +493,9 @@ ID3D11DeviceContext* GetD3D11DeviceContext()
 
 namespace rage
 {
+	static void** g_grmTechniquePointer = nullptr;
+	static grmShaderFactory** g_grmShaderFactory = nullptr;
+
 	static hook::cdecl_stub<bool(grmShaderFx*, const char*, void*, bool)> _grmShaderFx_LoadTechnique([]()
 	{
 		return hook::get_pattern("48 8B D9 BA 2E 00 00 00 48 8B CF 45 8A F1", -0x1C);
@@ -505,8 +508,7 @@ namespace rage
 
 	grmShaderFactory* grmShaderFactory::GetInstance()
 	{
-		static auto ptr = hook::get_address<grmShaderFactory**>(hook::get_pattern("84 C0 74 29 48 8B 0D ? ? ? ? 48 8B 01", 7));
-		return *ptr;
+		return *g_grmShaderFactory;
 	}
 
 	static hook::cdecl_stub<void(grmShaderDef*, int, grmShaderFx*)> _grmShaderDef_PushPass([]()
@@ -591,8 +593,7 @@ namespace rage
 
 	void grmShaderFx::PopTechnique()
 	{
-		static void** ptr = hook::get_address<void**>(hook::get_pattern("FF C9 48 C1 E1 05 49 03 09 48 89 0D", 12));
-		*ptr = nullptr;
+		*g_grmTechniquePointer = nullptr;
 	}
 }
 
@@ -707,4 +708,7 @@ static HookFunction hookFunction([] ()
 		hook::put<uint8_t>(location, 0xB8); // write to eax for later
 		hook::put<uint32_t>(location + 1, 0x4000000);
 	}
+
+	rage::g_grmShaderFactory = hook::get_address<rage::grmShaderFactory**>(hook::get_pattern("84 C0 74 29 48 8B 0D ? ? ? ? 48 8B 01", 7));
+	rage::g_grmTechniquePointer = hook::get_address<void**>(hook::get_pattern("FF C9 48 C1 E1 05 49 03 09 48 89 0D", 12));
 });
diff --git a/code/components/rage-graphics-five/src/RenderHooks.cpp b/code/components/rage-graphics-five/src/RenderHooks.cpp
index 03dd928b9a..989ddec1c6 100644
--- a/code/components/rage-graphics-five/src/RenderHooks.cpp
+++ b/code/components/rage-graphics-five/src/RenderHooks.cpp
@@ -1005,10 +1005,13 @@ static auto GetBackbuf()
 static auto GetInvariantD3D11Device()
 {
 	WRL::ComPtr<IDXGIDevice> realDeviceDxgi;
-	WRL::ComPtr<ID3D11Device> realDevice;
+	WRL::ComPtr<ID3D11Device> realDevice = nullptr;
 
 	GetD3D11Device()->QueryInterface(IID_PPV_ARGS(&realDeviceDxgi));
-	realDeviceDxgi.As(&realDevice);
+	if (realDeviceDxgi)
+	{
+		realDeviceDxgi.As(&realDevice);
+	}
 
 	return realDevice;
 }
@@ -1055,6 +1058,10 @@ void RenderBufferToBuffer(ID3D11RenderTargetView* rtv, int width = 0, int height
 
 		auto realDevice = GetInvariantD3D11Device();
 		auto realDeviceContext = GetInvariantD3D11DeviceContext();
+		if (!realDevice)
+		{
+			return;
+		}
 
 		auto m_width = resDesc.Width;
 		auto m_height = resDesc.Height;
@@ -1205,15 +1212,21 @@ void CaptureInternalScreenshot()
 			texDesc.CPUAccessFlags = 0;
 			texDesc.MiscFlags = 0;
 
+			WRL::ComPtr<ID3D11Device> device = GetInvariantD3D11Device();
+			if (!device)
+			{
+				return;
+			}
+
 			WRL::ComPtr<ID3D11Texture2D> d3dTex;
-			HRESULT hr = GetInvariantD3D11Device()->CreateTexture2D(&texDesc, nullptr, &d3dTex);
+			HRESULT hr = device->CreateTexture2D(&texDesc, nullptr, &d3dTex);
 			if FAILED(hr)
 			{
 				return;
 			}
 
 			D3D11_RENDER_TARGET_VIEW_DESC rtDesc = CD3D11_RENDER_TARGET_VIEW_DESC(d3dTex.Get(), D3D11_RTV_DIMENSION_TEXTURE2D);
-			GetInvariantD3D11Device()->CreateRenderTargetView(d3dTex.Get(), &rtDesc, &rtv);
+			device->CreateRenderTargetView(d3dTex.Get(), &rtDesc, &rtv);
 
 			d3dTex.CopyTo(&myTexture);
 		}
@@ -1361,15 +1374,21 @@ void CaptureBufferOutput()
 		texDesc.CPUAccessFlags = 0;
 		texDesc.MiscFlags = D3D11_RESOURCE_MISC_SHARED;
 
+		WRL::ComPtr<ID3D11Device> device = GetInvariantD3D11Device();
+		if (!device)
+		{
+			return;
+		}
+
 		WRL::ComPtr<ID3D11Texture2D> d3dTex;
-		HRESULT hr = GetInvariantD3D11Device()->CreateTexture2D(&texDesc, nullptr, &d3dTex);
+		HRESULT hr = device->CreateTexture2D(&texDesc, nullptr, &d3dTex);
 		if (FAILED(hr))
 		{
 			return;
 		}
 
 		D3D11_RENDER_TARGET_VIEW_DESC rtDesc = CD3D11_RENDER_TARGET_VIEW_DESC(d3dTex.Get(), D3D11_RTV_DIMENSION_TEXTURE2D);
-		GetInvariantD3D11Device()->CreateRenderTargetView(d3dTex.Get(), &rtDesc, &rtv);
+		device->CreateRenderTargetView(d3dTex.Get(), &rtDesc, &rtv);
 
 		d3dTex.CopyTo(&myTexture);
 
diff --git a/code/components/rage-input-five/src/InputHook.cpp b/code/components/rage-input-five/src/InputHook.cpp
index feb55b73ca..30ebd09ea3 100644
--- a/code/components/rage-input-five/src/InputHook.cpp
+++ b/code/components/rage-input-five/src/InputHook.cpp
@@ -648,6 +648,7 @@ static void SetInputWrap(int a1, void* a2, void* a3, void* a4)
 #endif
 
 static void (*origIOPadUpdate)(void*, bool);
+static void* ioPadArray = nullptr;
 
 // This hook is used for ReverseGame Gamepad input
 static void rage__ioPad__Update(rage::ioPad* thisptr, bool onlyVibrate)
@@ -655,10 +656,6 @@ static void rage__ioPad__Update(rage::ioPad* thisptr, bool onlyVibrate)
 	static HostSharedData<ReverseGameData> rgd("CfxReverseGameData");
 	WaitForSingleObject(rgd->inputMutex, INFINITE);
 
-	static char* location = (char*)hook::get_pattern("48 8D 05 ? ? ? ? 48 2B C8 48 B8 AB AA AA AA AA");
-	static int offset = *(int*)(location + 3);
-	static void* ioPadArray = location + offset + 7;
-
 #if 0
 	XINPUT_STATE state;
 	DWORD dwUserIndex = ((uintptr_t)out_RageIOPadState - (uintptr_t)ioPadArray) / 96/*sizeof(RageIOPad)*/;
@@ -804,6 +801,13 @@ static HookFunction hookFunction([]()
 			may = FALSE;
 		}
 	});
+
+	
+	{
+		char* location = (char*)hook::get_pattern("48 8D 05 ? ? ? ? 48 2B C8 48 B8 AB AA AA AA AA");
+		int offset = *(int*)(location + 3);
+		ioPadArray = location + offset + 7;
+	}
 });
 
 fwEvent<HWND, UINT, WPARAM, LPARAM, bool&, LRESULT&> InputHook::DeprecatedOnWndProc;
diff --git a/ext/native-decls/AddMinimapOverlay.md b/ext/native-decls/AddMinimapOverlay.md
index f2afc4dba3..cdfd04b4f4 100644
--- a/ext/native-decls/AddMinimapOverlay.md
+++ b/ext/native-decls/AddMinimapOverlay.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## ADD_MINIMAP_OVERLAY
 
diff --git a/ext/native-decls/AddMinimapOverlayWithDepth.md b/ext/native-decls/AddMinimapOverlayWithDepth.md
index 3e2290e664..7b578947b9 100644
--- a/ext/native-decls/AddMinimapOverlayWithDepth.md
+++ b/ext/native-decls/AddMinimapOverlayWithDepth.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## ADD_MINIMAP_OVERLAY_WITH_DEPTH
 
diff --git a/ext/native-decls/AddReplaceTexture.md b/ext/native-decls/AddReplaceTexture.md
index 0225bdc2cf..ea307304fb 100644
--- a/ext/native-decls/AddReplaceTexture.md
+++ b/ext/native-decls/AddReplaceTexture.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## ADD_REPLACE_TEXTURE
 
diff --git a/ext/native-decls/BreakOffVehicleWheel.md b/ext/native-decls/BreakOffVehicleWheel.md
index 8b9aefbdc9..de679ed06c 100644
--- a/ext/native-decls/BreakOffVehicleWheel.md
+++ b/ext/native-decls/BreakOffVehicleWheel.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## BREAK_OFF_VEHICLE_WHEEL
 
diff --git a/ext/native-decls/CallMinimapScaleformFunction.md b/ext/native-decls/CallMinimapScaleformFunction.md
index 7d388eb54e..abda1ad2b9 100644
--- a/ext/native-decls/CallMinimapScaleformFunction.md
+++ b/ext/native-decls/CallMinimapScaleformFunction.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## CALL_MINIMAP_SCALEFORM_FUNCTION
 
diff --git a/ext/native-decls/ClearDrawOrigin.md b/ext/native-decls/ClearDrawOrigin.md
new file mode 100644
index 0000000000..d3c31f0028
--- /dev/null
+++ b/ext/native-decls/ClearDrawOrigin.md
@@ -0,0 +1,12 @@
+---
+ns: CFX
+apiset: client
+game: rdr3
+---
+## CLEAR_DRAW_ORIGIN
+
+```c
+void CLEAR_DRAW_ORIGIN();
+```
+
+Resets the screen's draw-origin which was changed by the function [`SET_DRAW_ORIGIN`](#_0xE10198D5) back to `x=0, y=0`. See [`SET_DRAW_ORIGIN`](#_0xE10198D5) for further information.
diff --git a/ext/native-decls/ClearVehicleXenonLightsCustomColor.md b/ext/native-decls/ClearVehicleXenonLightsCustomColor.md
index 02ea81d02c..ea352340b9 100644
--- a/ext/native-decls/ClearVehicleXenonLightsCustomColor.md
+++ b/ext/native-decls/ClearVehicleXenonLightsCustomColor.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## CLEAR_VEHICLE_XENON_LIGHTS_CUSTOM_COLOR
 
diff --git a/ext/native-decls/CloneTimecycleModifier.md b/ext/native-decls/CloneTimecycleModifier.md
index db5f65936a..24d5fdf794 100644
--- a/ext/native-decls/CloneTimecycleModifier.md
+++ b/ext/native-decls/CloneTimecycleModifier.md
@@ -1,7 +1,6 @@
 ---
 ns: CFX
 apiset: client
-game: gta5
 ---
 ## CLONE_TIMECYCLE_MODIFIER
 
diff --git a/ext/native-decls/CommitRuntimeTexture.md b/ext/native-decls/CommitRuntimeTexture.md
index 9873fdb955..76f972b05a 100644
--- a/ext/native-decls/CommitRuntimeTexture.md
+++ b/ext/native-decls/CommitRuntimeTexture.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## COMMIT_RUNTIME_TEXTURE
 
diff --git a/ext/native-decls/CreateDryVolume.md b/ext/native-decls/CreateDryVolume.md
index 9c2f97ba1d..dec46d5b60 100644
--- a/ext/native-decls/CreateDryVolume.md
+++ b/ext/native-decls/CreateDryVolume.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## CREATE_DRY_VOLUME
 
diff --git a/ext/native-decls/CreateRuntimeTexture.md b/ext/native-decls/CreateRuntimeTexture.md
index c748cf5239..cd607fd391 100644
--- a/ext/native-decls/CreateRuntimeTexture.md
+++ b/ext/native-decls/CreateRuntimeTexture.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## CREATE_RUNTIME_TEXTURE
 
diff --git a/ext/native-decls/CreateRuntimeTextureFromDuiHandle.md b/ext/native-decls/CreateRuntimeTextureFromDuiHandle.md
index 56a13d1eb4..5ac1b983d3 100644
--- a/ext/native-decls/CreateRuntimeTextureFromDuiHandle.md
+++ b/ext/native-decls/CreateRuntimeTextureFromDuiHandle.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## CREATE_RUNTIME_TEXTURE_FROM_DUI_HANDLE
 
diff --git a/ext/native-decls/CreateRuntimeTextureFromImage.md b/ext/native-decls/CreateRuntimeTextureFromImage.md
index 933298866c..46c50e420c 100644
--- a/ext/native-decls/CreateRuntimeTextureFromImage.md
+++ b/ext/native-decls/CreateRuntimeTextureFromImage.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## CREATE_RUNTIME_TEXTURE_FROM_IMAGE
 
diff --git a/ext/native-decls/CreateRuntimeTxd.md b/ext/native-decls/CreateRuntimeTxd.md
index df3a4be425..9798200fdd 100644
--- a/ext/native-decls/CreateRuntimeTxd.md
+++ b/ext/native-decls/CreateRuntimeTxd.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## CREATE_RUNTIME_TXD
 
diff --git a/ext/native-decls/CreateTimecycleModifier.md b/ext/native-decls/CreateTimecycleModifier.md
index 85c2a9eb9d..f27dcd7dac 100644
--- a/ext/native-decls/CreateTimecycleModifier.md
+++ b/ext/native-decls/CreateTimecycleModifier.md
@@ -1,7 +1,6 @@
 ---
 ns: CFX
 apiset: client
-game: gta5
 ---
 ## CREATE_TIMECYCLE_MODIFIER
 
diff --git a/ext/native-decls/DisableIdleCamera.md b/ext/native-decls/DisableIdleCamera.md
index 0db3a52d19..23338ce6a4 100644
--- a/ext/native-decls/DisableIdleCamera.md
+++ b/ext/native-decls/DisableIdleCamera.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## DISABLE_IDLE_CAMERA
 
diff --git a/ext/native-decls/DisableVehiclePassengerIdleCamera.md b/ext/native-decls/DisableVehiclePassengerIdleCamera.md
index 059579cb2f..2babe58114 100644
--- a/ext/native-decls/DisableVehiclePassengerIdleCamera.md
+++ b/ext/native-decls/DisableVehiclePassengerIdleCamera.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## DISABLE_VEHICLE_PASSENGER_IDLE_CAMERA
 
diff --git a/ext/native-decls/DoesTimecycleModifierHasVar.md b/ext/native-decls/DoesTimecycleModifierHasVar.md
index 9392c7d341..143e73b416 100644
--- a/ext/native-decls/DoesTimecycleModifierHasVar.md
+++ b/ext/native-decls/DoesTimecycleModifierHasVar.md
@@ -1,7 +1,6 @@
 ---
 ns: CFX
 apiset: client
-game: gta5
 ---
 ## DOES_TIMECYCLE_MODIFIER_HAS_VAR
 
diff --git a/ext/native-decls/DrawBox.md b/ext/native-decls/DrawBox.md
new file mode 100644
index 0000000000..d1b04935ee
--- /dev/null
+++ b/ext/native-decls/DrawBox.md
@@ -0,0 +1,22 @@
+---
+ns: CFX
+apiset: client
+game: rdr3
+---
+## DRAW_BOX
+
+```c
+void DRAW_BOX(float x1, float y1, float z1, float x2, float y2, float z2, int red, int green, int blue, int alpha);
+```
+
+## Parameters
+* **x1**: 
+* **y1**: 
+* **z1**: 
+* **x2**: 
+* **y2**: 
+* **z2**: 
+* **red**: 
+* **green**: 
+* **blue**: 
+* **alpha**: 
diff --git a/ext/native-decls/DrawLine.md b/ext/native-decls/DrawLine.md
new file mode 100644
index 0000000000..7aad16113f
--- /dev/null
+++ b/ext/native-decls/DrawLine.md
@@ -0,0 +1,22 @@
+---
+ns: CFX
+apiset: client
+game: rdr3
+---
+## DRAW_LINE
+
+```c
+void DRAW_LINE(float x1, float y1, float z1, float x2, float y2, float z2, int red, int green, int blue, int alpha);
+```
+
+## Parameters
+* **x1**: 
+* **y1**: 
+* **z1**: 
+* **x2**: 
+* **y2**: 
+* **z2**: 
+* **red**: 
+* **green**: 
+* **blue**: 
+* **alpha**: 
diff --git a/ext/native-decls/DrawPoly.md b/ext/native-decls/DrawPoly.md
new file mode 100644
index 0000000000..ad9ac92dca
--- /dev/null
+++ b/ext/native-decls/DrawPoly.md
@@ -0,0 +1,25 @@
+---
+ns: CFX
+apiset: client
+game: rdr3
+---
+## DRAW_POLY
+
+```c
+void DRAW_POLY(float x1, float y1, float z1, float x2, float y2, float z2, float x3, float y3, float z3, int red, int green, int blue, int alpha);
+```
+
+## Parameters
+* **x1**: 
+* **y1**: 
+* **z1**: 
+* **x2**: 
+* **y2**: 
+* **z2**: 
+* **x3**: 
+* **y3**: 
+* **z3**: 
+* **red**: 
+* **green**: 
+* **blue**: 
+* **alpha**: 
diff --git a/ext/native-decls/GetAllRopes.md b/ext/native-decls/GetAllRopes.md
index 3ee213dd34..a675599bfc 100644
--- a/ext/native-decls/GetAllRopes.md
+++ b/ext/native-decls/GetAllRopes.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_ALL_ROPES
 
diff --git a/ext/native-decls/GetAllVehicleModels.md b/ext/native-decls/GetAllVehicleModels.md
index 1570f62c45..171661bb6b 100644
--- a/ext/native-decls/GetAllVehicleModels.md
+++ b/ext/native-decls/GetAllVehicleModels.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_ALL_VEHICLE_MODELS
 
diff --git a/ext/native-decls/GetInteriorEntitiesExtents.md b/ext/native-decls/GetInteriorEntitiesExtents.md
index a1e89205cd..a9195e18a0 100644
--- a/ext/native-decls/GetInteriorEntitiesExtents.md
+++ b/ext/native-decls/GetInteriorEntitiesExtents.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_INTERIOR_ENTITIES_EXTENTS
 
diff --git a/ext/native-decls/GetInteriorPortalCornerPosition.md b/ext/native-decls/GetInteriorPortalCornerPosition.md
index 9f49048d1e..add74ef443 100644
--- a/ext/native-decls/GetInteriorPortalCornerPosition.md
+++ b/ext/native-decls/GetInteriorPortalCornerPosition.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_INTERIOR_PORTAL_CORNER_POSITION
 
diff --git a/ext/native-decls/GetInteriorPortalCount.md b/ext/native-decls/GetInteriorPortalCount.md
index 38e67465e8..682d6f3521 100644
--- a/ext/native-decls/GetInteriorPortalCount.md
+++ b/ext/native-decls/GetInteriorPortalCount.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_INTERIOR_PORTAL_COUNT
 
diff --git a/ext/native-decls/GetInteriorPortalEntityArchetype.md b/ext/native-decls/GetInteriorPortalEntityArchetype.md
index e48d1b881a..ccf6c2128d 100644
--- a/ext/native-decls/GetInteriorPortalEntityArchetype.md
+++ b/ext/native-decls/GetInteriorPortalEntityArchetype.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_INTERIOR_PORTAL_ENTITY_ARCHETYPE
 
diff --git a/ext/native-decls/GetInteriorPortalEntityCount.md b/ext/native-decls/GetInteriorPortalEntityCount.md
index 5be488fc15..8e42f7f9f4 100644
--- a/ext/native-decls/GetInteriorPortalEntityCount.md
+++ b/ext/native-decls/GetInteriorPortalEntityCount.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_INTERIOR_PORTAL_ENTITY_COUNT
 
diff --git a/ext/native-decls/GetInteriorPortalEntityFlag.md b/ext/native-decls/GetInteriorPortalEntityFlag.md
index c97e1e3ca8..ad3b3fe7fb 100644
--- a/ext/native-decls/GetInteriorPortalEntityFlag.md
+++ b/ext/native-decls/GetInteriorPortalEntityFlag.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_INTERIOR_PORTAL_ENTITY_FLAG
 
diff --git a/ext/native-decls/GetInteriorPortalEntityPosition.md b/ext/native-decls/GetInteriorPortalEntityPosition.md
index 5fb2c34bf9..8bca338b3e 100644
--- a/ext/native-decls/GetInteriorPortalEntityPosition.md
+++ b/ext/native-decls/GetInteriorPortalEntityPosition.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_INTERIOR_PORTAL_ENTITY_POSITION
 
diff --git a/ext/native-decls/GetInteriorPortalEntityRotation.md b/ext/native-decls/GetInteriorPortalEntityRotation.md
index 8257056623..4dab7ccc59 100644
--- a/ext/native-decls/GetInteriorPortalEntityRotation.md
+++ b/ext/native-decls/GetInteriorPortalEntityRotation.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_INTERIOR_PORTAL_ENTITY_ROTATION
 
diff --git a/ext/native-decls/GetInteriorPortalFlag.md b/ext/native-decls/GetInteriorPortalFlag.md
index 1578c3ca84..62d90c3738 100644
--- a/ext/native-decls/GetInteriorPortalFlag.md
+++ b/ext/native-decls/GetInteriorPortalFlag.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_INTERIOR_PORTAL_FLAG
 
diff --git a/ext/native-decls/GetInteriorPortalRoomFrom.md b/ext/native-decls/GetInteriorPortalRoomFrom.md
index 9a133376e8..61441e3cd6 100644
--- a/ext/native-decls/GetInteriorPortalRoomFrom.md
+++ b/ext/native-decls/GetInteriorPortalRoomFrom.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_INTERIOR_PORTAL_ROOM_FROM
 
diff --git a/ext/native-decls/GetInteriorPortalRoomTo.md b/ext/native-decls/GetInteriorPortalRoomTo.md
index a158bdaed8..7944530bf2 100644
--- a/ext/native-decls/GetInteriorPortalRoomTo.md
+++ b/ext/native-decls/GetInteriorPortalRoomTo.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_INTERIOR_PORTAL_ROOM_TO
 
diff --git a/ext/native-decls/GetInteriorPosition.md b/ext/native-decls/GetInteriorPosition.md
index 0196b0130b..43307c1dc9 100644
--- a/ext/native-decls/GetInteriorPosition.md
+++ b/ext/native-decls/GetInteriorPosition.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_INTERIOR_POSITION
 
diff --git a/ext/native-decls/GetInteriorRoomCount.md b/ext/native-decls/GetInteriorRoomCount.md
index caf0fbb918..f213168eea 100644
--- a/ext/native-decls/GetInteriorRoomCount.md
+++ b/ext/native-decls/GetInteriorRoomCount.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_INTERIOR_ROOM_COUNT
 
diff --git a/ext/native-decls/GetInteriorRoomExtents.md b/ext/native-decls/GetInteriorRoomExtents.md
index 0cf4e0c898..2fe8698043 100644
--- a/ext/native-decls/GetInteriorRoomExtents.md
+++ b/ext/native-decls/GetInteriorRoomExtents.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_INTERIOR_ROOM_EXTENTS
 
diff --git a/ext/native-decls/GetInteriorRoomFlag.md b/ext/native-decls/GetInteriorRoomFlag.md
index b17c6515df..efae61659d 100644
--- a/ext/native-decls/GetInteriorRoomFlag.md
+++ b/ext/native-decls/GetInteriorRoomFlag.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_INTERIOR_ROOM_FLAG
 
diff --git a/ext/native-decls/GetInteriorRoomIndexByHash.md b/ext/native-decls/GetInteriorRoomIndexByHash.md
index dfcdd22aca..55653937f7 100644
--- a/ext/native-decls/GetInteriorRoomIndexByHash.md
+++ b/ext/native-decls/GetInteriorRoomIndexByHash.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_INTERIOR_ROOM_INDEX_BY_HASH
 
diff --git a/ext/native-decls/GetInteriorRoomName.md b/ext/native-decls/GetInteriorRoomName.md
index f6ca8895a3..1e295b4eff 100644
--- a/ext/native-decls/GetInteriorRoomName.md
+++ b/ext/native-decls/GetInteriorRoomName.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_INTERIOR_ROOM_NAME
 
diff --git a/ext/native-decls/GetInteriorRoomTimecycle.md b/ext/native-decls/GetInteriorRoomTimecycle.md
index f8b2914bee..4870e4d286 100644
--- a/ext/native-decls/GetInteriorRoomTimecycle.md
+++ b/ext/native-decls/GetInteriorRoomTimecycle.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_INTERIOR_ROOM_TIMECYCLE
 
diff --git a/ext/native-decls/GetInteriorRotation.md b/ext/native-decls/GetInteriorRotation.md
index a39aecc373..51b9f3c87c 100644
--- a/ext/native-decls/GetInteriorRotation.md
+++ b/ext/native-decls/GetInteriorRotation.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_INTERIOR_ROTATION
 
diff --git a/ext/native-decls/GetMapZoomDataLevel.md b/ext/native-decls/GetMapZoomDataLevel.md
index 1b3de1af0c..b35c862514 100644
--- a/ext/native-decls/GetMapZoomDataLevel.md
+++ b/ext/native-decls/GetMapZoomDataLevel.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_MAP_ZOOM_DATA_LEVEL
 
diff --git a/ext/native-decls/GetPauseMapPointerWorldPosition.md b/ext/native-decls/GetPauseMapPointerWorldPosition.md
index f9526d4d80..018806b4cc 100644
--- a/ext/native-decls/GetPauseMapPointerWorldPosition.md
+++ b/ext/native-decls/GetPauseMapPointerWorldPosition.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_PAUSE_MAP_POINTER_WORLD_POSITION
 
diff --git a/ext/native-decls/GetPedDecorations.md b/ext/native-decls/GetPedDecorations.md
index 7d8dbe3bd3..104d4899df 100644
--- a/ext/native-decls/GetPedDecorations.md
+++ b/ext/native-decls/GetPedDecorations.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_PED_DECORATIONS
 
diff --git a/ext/native-decls/GetPedEyeColor.md b/ext/native-decls/GetPedEyeColor.md
index 901ca418da..492866c8df 100644
--- a/ext/native-decls/GetPedEyeColor.md
+++ b/ext/native-decls/GetPedEyeColor.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_PED_EYE_COLOR
 
diff --git a/ext/native-decls/GetPedFaceFeature.md b/ext/native-decls/GetPedFaceFeature.md
index dbce89cb31..5e27ee9203 100644
--- a/ext/native-decls/GetPedFaceFeature.md
+++ b/ext/native-decls/GetPedFaceFeature.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_PED_FACE_FEATURE
 
diff --git a/ext/native-decls/GetPedHairColor.md b/ext/native-decls/GetPedHairColor.md
index 7414e7ce57..4f833d7992 100644
--- a/ext/native-decls/GetPedHairColor.md
+++ b/ext/native-decls/GetPedHairColor.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_PED_HAIR_COLOR
 
diff --git a/ext/native-decls/GetPedHairHighlightColor.md b/ext/native-decls/GetPedHairHighlightColor.md
index cb95bcfd4a..009bb461ff 100644
--- a/ext/native-decls/GetPedHairHighlightColor.md
+++ b/ext/native-decls/GetPedHairHighlightColor.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_PED_HAIR_HIGHLIGHT_COLOR
 
diff --git a/ext/native-decls/GetPedHeadOverlayData.md b/ext/native-decls/GetPedHeadOverlayData.md
index d439b2411f..6b80b6227c 100644
--- a/ext/native-decls/GetPedHeadOverlayData.md
+++ b/ext/native-decls/GetPedHeadOverlayData.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_PED_HEAD_OVERLAY_DATA
 
diff --git a/ext/native-decls/GetPedMovementClipset.md b/ext/native-decls/GetPedMovementClipset.md
index 9d1c6c13aa..3759184d18 100644
--- a/ext/native-decls/GetPedMovementClipset.md
+++ b/ext/native-decls/GetPedMovementClipset.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_PED_MOVEMENT_CLIPSET
 
diff --git a/ext/native-decls/GetPedSweat.md b/ext/native-decls/GetPedSweat.md
index 9aacddb063..c6479913d2 100644
--- a/ext/native-decls/GetPedSweat.md
+++ b/ext/native-decls/GetPedSweat.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_PED_SWEAT
 
diff --git a/ext/native-decls/GetPlayerInvincible2.md b/ext/native-decls/GetPlayerInvincible_2.md
similarity index 86%
rename from ext/native-decls/GetPlayerInvincible2.md
rename to ext/native-decls/GetPlayerInvincible_2.md
index 74132cfa3d..44e270e2f5 100644
--- a/ext/native-decls/GetPlayerInvincible2.md
+++ b/ext/native-decls/GetPlayerInvincible_2.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_PLAYER_INVINCIBLE_2
 
@@ -13,4 +14,4 @@ Unlike [GET_PLAYER_INVINCIBLE](#_0xB721981B2B939E07) this native gets both [SET_
 * **player**: The player id
 
 ## Return value
-A boolean to tell if the player is invincible.
\ No newline at end of file
+A boolean to tell if the player is invincible.
diff --git a/ext/native-decls/GetRopeFlags.md b/ext/native-decls/GetRopeFlags.md
index 398b60d40f..b405efba36 100644
--- a/ext/native-decls/GetRopeFlags.md
+++ b/ext/native-decls/GetRopeFlags.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_ROPE_FLAGS
 
diff --git a/ext/native-decls/GetRopeLengthChangeRate.md b/ext/native-decls/GetRopeLengthChangeRate.md
index 427d67a962..bb82ec4ba1 100644
--- a/ext/native-decls/GetRopeLengthChangeRate.md
+++ b/ext/native-decls/GetRopeLengthChangeRate.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_ROPE_LENGTH_CHANGE_RATE
 
diff --git a/ext/native-decls/GetRopeTimeMultiplier.md b/ext/native-decls/GetRopeTimeMultiplier.md
index 0ff6039421..7da72ce673 100644
--- a/ext/native-decls/GetRopeTimeMultiplier.md
+++ b/ext/native-decls/GetRopeTimeMultiplier.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_ROPE_TIME_MULTIPLIER
 
diff --git a/ext/native-decls/GetRopeUpdateOrder.md b/ext/native-decls/GetRopeUpdateOrder.md
index 398853d6b2..b7f10ad0b4 100644
--- a/ext/native-decls/GetRopeUpdateOrder.md
+++ b/ext/native-decls/GetRopeUpdateOrder.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_ROPE_UPDATE_ORDER
 
diff --git a/ext/native-decls/GetRuntimeTextureHeight.md b/ext/native-decls/GetRuntimeTextureHeight.md
index 4b4e575698..70cf50d49a 100644
--- a/ext/native-decls/GetRuntimeTextureHeight.md
+++ b/ext/native-decls/GetRuntimeTextureHeight.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_RUNTIME_TEXTURE_HEIGHT
 
diff --git a/ext/native-decls/GetRuntimeTexturePitch.md b/ext/native-decls/GetRuntimeTexturePitch.md
index d154538e55..c6052e9ffa 100644
--- a/ext/native-decls/GetRuntimeTexturePitch.md
+++ b/ext/native-decls/GetRuntimeTexturePitch.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_RUNTIME_TEXTURE_PITCH
 
diff --git a/ext/native-decls/GetRuntimeTextureWidth.md b/ext/native-decls/GetRuntimeTextureWidth.md
index 3cab3a3d3f..3e66ec0ee1 100644
--- a/ext/native-decls/GetRuntimeTextureWidth.md
+++ b/ext/native-decls/GetRuntimeTextureWidth.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_RUNTIME_TEXTURE_WIDTH
 
diff --git a/ext/native-decls/GetShapeTestResultIncludingMaterial.md b/ext/native-decls/GetShapeTestResultIncludingMaterial.md
new file mode 100644
index 0000000000..d0ba52100c
--- /dev/null
+++ b/ext/native-decls/GetShapeTestResultIncludingMaterial.md
@@ -0,0 +1,27 @@
+---
+ns: CFX
+apiset: client
+game: rdr3
+---
+## GET_SHAPE_TEST_RESULT_INCLUDING_MATERIAL
+
+```c
+int GET_SHAPE_TEST_RESULT_INCLUDING_MATERIAL(int shapeTestHandle, BOOL* hit, Vector3* endCoords, Vector3* surfaceNormal, Hash* materialHash, Entity* entityHit);
+```
+
+Returns the result of a shape test, also returning the material of any touched surface.
+
+When used with an asynchronous shape test, this native should be looped until returning 0 or 2, after which the handle is invalidated.
+
+Unless the return value is 2, the other return values are undefined.
+
+## Parameters
+* **shapeTestHandle**: A shape test handle.
+* **hit**: Whether or not the shape test hit any collisions.
+* **endCoords**: The resulting coordinates where the shape test hit a collision.
+* **surfaceNormal**: The surface normal of the hit position.
+* **materialHash**: hash of the hit material or surface type, see materialFX.dat
+* **entityHit**: Any dynamic entity hit by the shape test.
+
+## Return value
+`0` if the handle is invalid, `1` if the shape test is still pending, or `2` if the shape test has completed, and the handle should be invalidated.
diff --git a/ext/native-decls/GetTimecycleModifierCount.md b/ext/native-decls/GetTimecycleModifierCount.md
index 6d1c24a363..76cc590a9c 100644
--- a/ext/native-decls/GetTimecycleModifierCount.md
+++ b/ext/native-decls/GetTimecycleModifierCount.md
@@ -1,7 +1,6 @@
 ---
 ns: CFX
 apiset: client
-game: gta5
 ---
 ## GET_TIMECYCLE_MODIFIER_COUNT
 
diff --git a/ext/native-decls/GetTimecycleModifierIndexByName.md b/ext/native-decls/GetTimecycleModifierIndexByName.md
index 92a6c7d301..1b374f1beb 100644
--- a/ext/native-decls/GetTimecycleModifierIndexByName.md
+++ b/ext/native-decls/GetTimecycleModifierIndexByName.md
@@ -1,7 +1,6 @@
 ---
 ns: CFX
 apiset: client
-game: gta5
 ---
 ## GET_TIMECYCLE_MODIFIER_INDEX_BY_NAME
 
diff --git a/ext/native-decls/GetTimecycleModifierNameByIndex.md b/ext/native-decls/GetTimecycleModifierNameByIndex.md
index 34d2364cce..2841370125 100644
--- a/ext/native-decls/GetTimecycleModifierNameByIndex.md
+++ b/ext/native-decls/GetTimecycleModifierNameByIndex.md
@@ -1,7 +1,6 @@
 ---
 ns: CFX
 apiset: client
-game: gta5
 ---
 ## GET_TIMECYCLE_MODIFIER_NAME_BY_INDEX
 
diff --git a/ext/native-decls/GetTimecycleModifierStrength.md b/ext/native-decls/GetTimecycleModifierStrength.md
index 93312a7587..9ad9241f29 100644
--- a/ext/native-decls/GetTimecycleModifierStrength.md
+++ b/ext/native-decls/GetTimecycleModifierStrength.md
@@ -1,7 +1,6 @@
 ---
 ns: CFX
 apiset: client
-game: gta5
 ---
 ## GET_TIMECYCLE_MODIFIER_STRENGTH
 
diff --git a/ext/native-decls/GetTimecycleModifierVar.md b/ext/native-decls/GetTimecycleModifierVar.md
index dc06cc179d..cff26d5102 100644
--- a/ext/native-decls/GetTimecycleModifierVar.md
+++ b/ext/native-decls/GetTimecycleModifierVar.md
@@ -1,7 +1,6 @@
 ---
 ns: CFX
 apiset: client
-game: gta5
 ---
 ## GET_TIMECYCLE_MODIFIER_VAR
 
diff --git a/ext/native-decls/GetTimecycleModifierVarCount.md b/ext/native-decls/GetTimecycleModifierVarCount.md
index 738072ac9e..958af147a7 100644
--- a/ext/native-decls/GetTimecycleModifierVarCount.md
+++ b/ext/native-decls/GetTimecycleModifierVarCount.md
@@ -1,7 +1,6 @@
 ---
 ns: CFX
 apiset: client
-game: gta5
 ---
 ## GET_TIMECYCLE_MODIFIER_VAR_COUNT
 
diff --git a/ext/native-decls/GetTimecycleModifierVarNameByIndex.md b/ext/native-decls/GetTimecycleModifierVarNameByIndex.md
index f3874a16da..c09534f358 100644
--- a/ext/native-decls/GetTimecycleModifierVarNameByIndex.md
+++ b/ext/native-decls/GetTimecycleModifierVarNameByIndex.md
@@ -1,7 +1,6 @@
 ---
 ns: CFX
 apiset: client
-game: gta5
 ---
 ## GET_TIMECYCLE_MODIFIER_VAR_NAME_BY_INDEX
 
diff --git a/ext/native-decls/GetTimecycleVarCount.md b/ext/native-decls/GetTimecycleVarCount.md
index cd1178061d..388c2315f1 100644
--- a/ext/native-decls/GetTimecycleVarCount.md
+++ b/ext/native-decls/GetTimecycleVarCount.md
@@ -1,7 +1,6 @@
 ---
 ns: CFX
 apiset: client
-game: gta5
 ---
 ## GET_TIMECYCLE_VAR_COUNT
 
diff --git a/ext/native-decls/GetTimecycleVarDefaultValueByIndex.md b/ext/native-decls/GetTimecycleVarDefaultValueByIndex.md
index 2ed16d7eac..6bc9fbed0d 100644
--- a/ext/native-decls/GetTimecycleVarDefaultValueByIndex.md
+++ b/ext/native-decls/GetTimecycleVarDefaultValueByIndex.md
@@ -1,7 +1,6 @@
 ---
 ns: CFX
 apiset: client
-game: gta5
 ---
 ## GET_TIMECYCLE_VAR_DEFAULT_VALUE_BY_INDEX
 
diff --git a/ext/native-decls/GetTimecycleVarNameByIndex.md b/ext/native-decls/GetTimecycleVarNameByIndex.md
index e2ebae0778..1bd3ed784c 100644
--- a/ext/native-decls/GetTimecycleVarNameByIndex.md
+++ b/ext/native-decls/GetTimecycleVarNameByIndex.md
@@ -1,7 +1,6 @@
 ---
 ns: CFX
 apiset: client
-game: gta5
 ---
 ## GET_TIMECYCLE_VAR_NAME_BY_INDEX
 
diff --git a/ext/native-decls/GetTrainCurrentTrackNode.md b/ext/native-decls/GetTrainCurrentTrackNode.md
index 7ea3657b60..58e982d1d8 100644
--- a/ext/native-decls/GetTrainCurrentTrackNode.md
+++ b/ext/native-decls/GetTrainCurrentTrackNode.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_TRAIN_CURRENT_TRACK_NODE
 
diff --git a/ext/native-decls/GetTrainDoorCount.md b/ext/native-decls/GetTrainDoorCount.md
index f6cd75fc59..2520dd654b 100644
--- a/ext/native-decls/GetTrainDoorCount.md
+++ b/ext/native-decls/GetTrainDoorCount.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_TRAIN_DOOR_COUNT
 
diff --git a/ext/native-decls/GetTrainDoorOpenRatio.md b/ext/native-decls/GetTrainDoorOpenRatio.md
index 2676649270..bcf13f8e9a 100644
--- a/ext/native-decls/GetTrainDoorOpenRatio.md
+++ b/ext/native-decls/GetTrainDoorOpenRatio.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_TRAIN_DOOR_OPEN_RATIO
 
diff --git a/ext/native-decls/GetVehicleAlarmTimeLeft.md b/ext/native-decls/GetVehicleAlarmTimeLeft.md
index d1a907a39e..694b944a2d 100644
--- a/ext/native-decls/GetVehicleAlarmTimeLeft.md
+++ b/ext/native-decls/GetVehicleAlarmTimeLeft.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_ALARM_TIME_LEFT
 
diff --git a/ext/native-decls/GetVehicleCheatPowerIncrease.md b/ext/native-decls/GetVehicleCheatPowerIncrease.md
index 79ed3fbe10..87d55fe206 100644
--- a/ext/native-decls/GetVehicleCheatPowerIncrease.md
+++ b/ext/native-decls/GetVehicleCheatPowerIncrease.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_CHEAT_POWER_INCREASE
 
diff --git a/ext/native-decls/GetVehicleClutch.md b/ext/native-decls/GetVehicleClutch.md
index fdaff5fd2f..344ead46d4 100644
--- a/ext/native-decls/GetVehicleClutch.md
+++ b/ext/native-decls/GetVehicleClutch.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_CLUTCH
 
diff --git a/ext/native-decls/GetVehicleCurrentGear.md b/ext/native-decls/GetVehicleCurrentGear.md
index c5cadf6f34..8cae5dd4a9 100644
--- a/ext/native-decls/GetVehicleCurrentGear.md
+++ b/ext/native-decls/GetVehicleCurrentGear.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_CURRENT_GEAR
 
diff --git a/ext/native-decls/GetVehicleCurrentRpm.md b/ext/native-decls/GetVehicleCurrentRpm.md
index 91927ccc99..7e6b66787d 100644
--- a/ext/native-decls/GetVehicleCurrentRpm.md
+++ b/ext/native-decls/GetVehicleCurrentRpm.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_CURRENT_RPM
 
diff --git a/ext/native-decls/GetVehicleDashboardBoost.md b/ext/native-decls/GetVehicleDashboardBoost.md
index 49d69fbacb..8249e509c5 100644
--- a/ext/native-decls/GetVehicleDashboardBoost.md
+++ b/ext/native-decls/GetVehicleDashboardBoost.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_DASHBOARD_BOOST
 
diff --git a/ext/native-decls/GetVehicleDashboardFuel.md b/ext/native-decls/GetVehicleDashboardFuel.md
index 6ef6bcc0cc..d51ac33f18 100644
--- a/ext/native-decls/GetVehicleDashboardFuel.md
+++ b/ext/native-decls/GetVehicleDashboardFuel.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_DASHBOARD_FUEL
 
diff --git a/ext/native-decls/GetVehicleDashboardLights.md b/ext/native-decls/GetVehicleDashboardLights.md
index 19b8128ebb..2b75a4d098 100644
--- a/ext/native-decls/GetVehicleDashboardLights.md
+++ b/ext/native-decls/GetVehicleDashboardLights.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_DASHBOARD_LIGHTS
 
diff --git a/ext/native-decls/GetVehicleDashboardOilPressure.md b/ext/native-decls/GetVehicleDashboardOilPressure.md
index e932d87139..c5fd35f241 100644
--- a/ext/native-decls/GetVehicleDashboardOilPressure.md
+++ b/ext/native-decls/GetVehicleDashboardOilPressure.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_DASHBOARD_OIL_PRESSURE
 
diff --git a/ext/native-decls/GetVehicleDashboardOilTemp.md b/ext/native-decls/GetVehicleDashboardOilTemp.md
index 7c59722c33..ee7b553f85 100644
--- a/ext/native-decls/GetVehicleDashboardOilTemp.md
+++ b/ext/native-decls/GetVehicleDashboardOilTemp.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_DASHBOARD_OIL_TEMP
 
diff --git a/ext/native-decls/GetVehicleDashboardRPM.md b/ext/native-decls/GetVehicleDashboardRPM.md
index be90c163cf..cf04a23eef 100644
--- a/ext/native-decls/GetVehicleDashboardRPM.md
+++ b/ext/native-decls/GetVehicleDashboardRPM.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_DASHBOARD_RPM
 
diff --git a/ext/native-decls/GetVehicleDashboardSpeed.md b/ext/native-decls/GetVehicleDashboardSpeed.md
index db68b316fa..f038796632 100644
--- a/ext/native-decls/GetVehicleDashboardSpeed.md
+++ b/ext/native-decls/GetVehicleDashboardSpeed.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_DASHBOARD_SPEED
 
diff --git a/ext/native-decls/GetVehicleDashboardTemp.md b/ext/native-decls/GetVehicleDashboardTemp.md
index 6e56efa898..568661a441 100644
--- a/ext/native-decls/GetVehicleDashboardTemp.md
+++ b/ext/native-decls/GetVehicleDashboardTemp.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_DASHBOARD_TEMP
 
diff --git a/ext/native-decls/GetVehicleDashboardVacuum.md b/ext/native-decls/GetVehicleDashboardVacuum.md
index 6bd5ce93f9..de5ccc52cf 100644
--- a/ext/native-decls/GetVehicleDashboardVacuum.md
+++ b/ext/native-decls/GetVehicleDashboardVacuum.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_DASHBOARD_VACUUM
 
diff --git a/ext/native-decls/GetVehicleDashboardWaterTemp.md b/ext/native-decls/GetVehicleDashboardWaterTemp.md
index 59252af6ed..402a31b635 100644
--- a/ext/native-decls/GetVehicleDashboardWaterTemp.md
+++ b/ext/native-decls/GetVehicleDashboardWaterTemp.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_DASHBOARD_WATER_TEMP
 
diff --git a/ext/native-decls/GetVehicleDrawnWheelAngleMult.md b/ext/native-decls/GetVehicleDrawnWheelAngleMult.md
index 5ea875844e..9bdcc4f0ca 100644
--- a/ext/native-decls/GetVehicleDrawnWheelAngleMult.md
+++ b/ext/native-decls/GetVehicleDrawnWheelAngleMult.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_DRAWN_WHEEL_ANGLE_MULT
 
diff --git a/ext/native-decls/GetVehicleEngineTemperature.md b/ext/native-decls/GetVehicleEngineTemperature.md
index 894fe2e830..99544f55bc 100644
--- a/ext/native-decls/GetVehicleEngineTemperature.md
+++ b/ext/native-decls/GetVehicleEngineTemperature.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_ENGINE_TEMPERATURE
 
diff --git a/ext/native-decls/GetVehicleFuelLevel.md b/ext/native-decls/GetVehicleFuelLevel.md
index e981db1f3c..07f1d0d459 100644
--- a/ext/native-decls/GetVehicleFuelLevel.md
+++ b/ext/native-decls/GetVehicleFuelLevel.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_FUEL_LEVEL
 
diff --git a/ext/native-decls/GetVehicleGravityAmount.md b/ext/native-decls/GetVehicleGravityAmount.md
index 20b27a5706..3d73f6b098 100644
--- a/ext/native-decls/GetVehicleGravityAmount.md
+++ b/ext/native-decls/GetVehicleGravityAmount.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_GRAVITY_AMOUNT
 
diff --git a/ext/native-decls/GetVehicleHandbrake.md b/ext/native-decls/GetVehicleHandbrake.md
index 84c151aaac..0cb659a22a 100644
--- a/ext/native-decls/GetVehicleHandbrake.md
+++ b/ext/native-decls/GetVehicleHandbrake.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: shared
+game: gta5
 ---
 ## GET_VEHICLE_HANDBRAKE
 
diff --git a/ext/native-decls/GetVehicleHandlingFloat.md b/ext/native-decls/GetVehicleHandlingFloat.md
index ab8face92a..dca71eb157 100644
--- a/ext/native-decls/GetVehicleHandlingFloat.md
+++ b/ext/native-decls/GetVehicleHandlingFloat.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_HANDLING_FLOAT
 
diff --git a/ext/native-decls/GetVehicleHandlingInt.md b/ext/native-decls/GetVehicleHandlingInt.md
index 61f0137636..e492fed8a4 100644
--- a/ext/native-decls/GetVehicleHandlingInt.md
+++ b/ext/native-decls/GetVehicleHandlingInt.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_HANDLING_INT
 
diff --git a/ext/native-decls/GetVehicleHandlingVector.md b/ext/native-decls/GetVehicleHandlingVector.md
index cd9faed1be..8509329127 100644
--- a/ext/native-decls/GetVehicleHandlingVector.md
+++ b/ext/native-decls/GetVehicleHandlingVector.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_HANDLING_VECTOR
 
diff --git a/ext/native-decls/GetVehicleHighGear.md b/ext/native-decls/GetVehicleHighGear.md
index 8859682c04..09478f85c2 100644
--- a/ext/native-decls/GetVehicleHighGear.md
+++ b/ext/native-decls/GetVehicleHighGear.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_HIGH_GEAR
 
diff --git a/ext/native-decls/GetVehicleIndicatorLights.md b/ext/native-decls/GetVehicleIndicatorLights.md
index 1a0b06a71a..b0cf0cd89b 100644
--- a/ext/native-decls/GetVehicleIndicatorLights.md
+++ b/ext/native-decls/GetVehicleIndicatorLights.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_INDICATOR_LIGHTS
 
diff --git a/ext/native-decls/GetVehicleLightMultiplier.md b/ext/native-decls/GetVehicleLightMultiplier.md
index b5d4d7fb2b..3cd03fb5fa 100644
--- a/ext/native-decls/GetVehicleLightMultiplier.md
+++ b/ext/native-decls/GetVehicleLightMultiplier.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_LIGHT_MULTIPLIER
 
diff --git a/ext/native-decls/GetVehicleNextGear.md b/ext/native-decls/GetVehicleNextGear.md
index 672ec760b7..89c241ed2b 100644
--- a/ext/native-decls/GetVehicleNextGear.md
+++ b/ext/native-decls/GetVehicleNextGear.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_NEXT_GEAR
 
diff --git a/ext/native-decls/GetVehicleNumberOfWheels.md b/ext/native-decls/GetVehicleNumberOfWheels.md
index 54a2533c33..bc45e548c9 100644
--- a/ext/native-decls/GetVehicleNumberOfWheels.md
+++ b/ext/native-decls/GetVehicleNumberOfWheels.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_NUMBER_OF_WHEELS
 
diff --git a/ext/native-decls/GetVehicleOilLevel.md b/ext/native-decls/GetVehicleOilLevel.md
index 00bff359e8..3533f8f1e0 100644
--- a/ext/native-decls/GetVehicleOilLevel.md
+++ b/ext/native-decls/GetVehicleOilLevel.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_OIL_LEVEL
 
diff --git a/ext/native-decls/GetVehicleSteeringAngle.md b/ext/native-decls/GetVehicleSteeringAngle.md
index b2d9398cc6..8d24461d8e 100644
--- a/ext/native-decls/GetVehicleSteeringAngle.md
+++ b/ext/native-decls/GetVehicleSteeringAngle.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: shared
+game: gta5
 ---
 ## GET_VEHICLE_STEERING_ANGLE
 
diff --git a/ext/native-decls/GetVehicleSteeringScale.md b/ext/native-decls/GetVehicleSteeringScale.md
index 047a18c18d..f28b151989 100644
--- a/ext/native-decls/GetVehicleSteeringScale.md
+++ b/ext/native-decls/GetVehicleSteeringScale.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_STEERING_SCALE
 
diff --git a/ext/native-decls/GetVehicleThrottleOffset.md b/ext/native-decls/GetVehicleThrottleOffset.md
index 5391dc4fa5..7c84c60776 100644
--- a/ext/native-decls/GetVehicleThrottleOffset.md
+++ b/ext/native-decls/GetVehicleThrottleOffset.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 aliases: ["GET_VEHICLE_CURRENT_ACCELERATION"]
 ---
 ## GET_VEHICLE_THROTTLE_OFFSET
diff --git a/ext/native-decls/GetVehicleTopSpeedModifier.md b/ext/native-decls/GetVehicleTopSpeedModifier.md
index 8cdcf4af30..8496f7f5d0 100644
--- a/ext/native-decls/GetVehicleTopSpeedModifier.md
+++ b/ext/native-decls/GetVehicleTopSpeedModifier.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_TOP_SPEED_MODIFIER
 
diff --git a/ext/native-decls/GetVehicleTurboPressure.md b/ext/native-decls/GetVehicleTurboPressure.md
index 816567bc9b..cd0c2532f1 100644
--- a/ext/native-decls/GetVehicleTurboPressure.md
+++ b/ext/native-decls/GetVehicleTurboPressure.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_TURBO_PRESSURE
 
diff --git a/ext/native-decls/GetVehicleWheelBrakePressure.md b/ext/native-decls/GetVehicleWheelBrakePressure.md
index 6e45d4b303..31cf1cbc8e 100644
--- a/ext/native-decls/GetVehicleWheelBrakePressure.md
+++ b/ext/native-decls/GetVehicleWheelBrakePressure.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_WHEEL_BRAKE_PRESSURE
 
diff --git a/ext/native-decls/GetVehicleWheelFlags.md b/ext/native-decls/GetVehicleWheelFlags.md
index 1ba04b6fc2..111893496a 100644
--- a/ext/native-decls/GetVehicleWheelFlags.md
+++ b/ext/native-decls/GetVehicleWheelFlags.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_WHEEL_FLAGS
 
diff --git a/ext/native-decls/GetVehicleWheelHealth.md b/ext/native-decls/GetVehicleWheelHealth.md
index dd9903e453..bcb457c779 100644
--- a/ext/native-decls/GetVehicleWheelHealth.md
+++ b/ext/native-decls/GetVehicleWheelHealth.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_WHEEL_HEALTH
 
diff --git a/ext/native-decls/GetVehicleWheelIsPowered.md b/ext/native-decls/GetVehicleWheelIsPowered.md
index 554b1a86a0..81a7777ff3 100644
--- a/ext/native-decls/GetVehicleWheelIsPowered.md
+++ b/ext/native-decls/GetVehicleWheelIsPowered.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_WHEEL_IS_POWERED
 
diff --git a/ext/native-decls/GetVehicleWheelPower.md b/ext/native-decls/GetVehicleWheelPower.md
index 2083ad2efe..68d100229e 100644
--- a/ext/native-decls/GetVehicleWheelPower.md
+++ b/ext/native-decls/GetVehicleWheelPower.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_WHEEL_POWER
 
diff --git a/ext/native-decls/GetVehicleWheelRimColliderSize.md b/ext/native-decls/GetVehicleWheelRimColliderSize.md
index 7fd3b73acd..be6fed9658 100644
--- a/ext/native-decls/GetVehicleWheelRimColliderSize.md
+++ b/ext/native-decls/GetVehicleWheelRimColliderSize.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_WHEEL_RIM_COLLIDER_SIZE
 
diff --git a/ext/native-decls/GetVehicleWheelRotationSpeed.md b/ext/native-decls/GetVehicleWheelRotationSpeed.md
index 6158b9340f..9254b7ca91 100644
--- a/ext/native-decls/GetVehicleWheelRotationSpeed.md
+++ b/ext/native-decls/GetVehicleWheelRotationSpeed.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_WHEEL_ROTATION_SPEED
 
diff --git a/ext/native-decls/GetVehicleWheelSize.md b/ext/native-decls/GetVehicleWheelSize.md
index 19c44ecaff..37f7a65a0f 100644
--- a/ext/native-decls/GetVehicleWheelSize.md
+++ b/ext/native-decls/GetVehicleWheelSize.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_WHEEL_SIZE
 
diff --git a/ext/native-decls/GetVehicleWheelSpeed.md b/ext/native-decls/GetVehicleWheelSpeed.md
index 2170063b2b..dbd50fe345 100644
--- a/ext/native-decls/GetVehicleWheelSpeed.md
+++ b/ext/native-decls/GetVehicleWheelSpeed.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_WHEEL_SPEED
 
diff --git a/ext/native-decls/GetVehicleWheelSteeringAngle.md b/ext/native-decls/GetVehicleWheelSteeringAngle.md
index 28989baf8c..e512eefe20 100644
--- a/ext/native-decls/GetVehicleWheelSteeringAngle.md
+++ b/ext/native-decls/GetVehicleWheelSteeringAngle.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_WHEEL_STEERING_ANGLE
 
diff --git a/ext/native-decls/GetVehicleWheelSurfaceMaterial.md b/ext/native-decls/GetVehicleWheelSurfaceMaterial.md
index 75437b8ef2..ab4cf655c7 100644
--- a/ext/native-decls/GetVehicleWheelSurfaceMaterial.md
+++ b/ext/native-decls/GetVehicleWheelSurfaceMaterial.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_WHEEL_SURFACE_MATERIAL
 
diff --git a/ext/native-decls/GetVehicleWheelSuspensionCompression.md b/ext/native-decls/GetVehicleWheelSuspensionCompression.md
index db9c837712..3f7880bef4 100644
--- a/ext/native-decls/GetVehicleWheelSuspensionCompression.md
+++ b/ext/native-decls/GetVehicleWheelSuspensionCompression.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_WHEEL_SUSPENSION_COMPRESSION
 
diff --git a/ext/native-decls/GetVehicleWheelTireColliderSize.md b/ext/native-decls/GetVehicleWheelTireColliderSize.md
index 7dee9383e0..fb8d1b1772 100644
--- a/ext/native-decls/GetVehicleWheelTireColliderSize.md
+++ b/ext/native-decls/GetVehicleWheelTireColliderSize.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_WHEEL_TIRE_COLLIDER_SIZE
 
diff --git a/ext/native-decls/GetVehicleWheelTireColliderWidth.md b/ext/native-decls/GetVehicleWheelTireColliderWidth.md
index 755e2bef5e..70366bcf68 100644
--- a/ext/native-decls/GetVehicleWheelTireColliderWidth.md
+++ b/ext/native-decls/GetVehicleWheelTireColliderWidth.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_WHEEL_TIRE_COLLIDER_WIDTH
 
diff --git a/ext/native-decls/GetVehicleWheelTractionVectorLength.md b/ext/native-decls/GetVehicleWheelTractionVectorLength.md
index f4b7209c82..cf79ba678a 100644
--- a/ext/native-decls/GetVehicleWheelTractionVectorLength.md
+++ b/ext/native-decls/GetVehicleWheelTractionVectorLength.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_WHEEL_TRACTION_VECTOR_LENGTH
 
diff --git a/ext/native-decls/GetVehicleWheelWidth.md b/ext/native-decls/GetVehicleWheelWidth.md
index 94a19d5c45..31a22c0e3e 100644
--- a/ext/native-decls/GetVehicleWheelWidth.md
+++ b/ext/native-decls/GetVehicleWheelWidth.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_WHEEL_WIDTH
 
diff --git a/ext/native-decls/GetVehicleWheelXOffset.md b/ext/native-decls/GetVehicleWheelXOffset.md
index e6e252f6a5..91cc63d253 100644
--- a/ext/native-decls/GetVehicleWheelXOffset.md
+++ b/ext/native-decls/GetVehicleWheelXOffset.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_WHEEL_X_OFFSET
 
diff --git a/ext/native-decls/GetVehicleWheelYRotation.md b/ext/native-decls/GetVehicleWheelYRotation.md
index 998d1fec04..247cc3d5d5 100644
--- a/ext/native-decls/GetVehicleWheelYRotation.md
+++ b/ext/native-decls/GetVehicleWheelYRotation.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 aliases: ["GET_VEHICLE_WHEEL_XROT"]
 ---
 ## GET_VEHICLE_WHEEL_Y_ROTATION
diff --git a/ext/native-decls/GetVehicleWheelieState.md b/ext/native-decls/GetVehicleWheelieState.md
index 815927e165..6724805278 100644
--- a/ext/native-decls/GetVehicleWheelieState.md
+++ b/ext/native-decls/GetVehicleWheelieState.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_WHEELIE_STATE
 
diff --git a/ext/native-decls/GetVehicleXenonLightsCustomColor.md b/ext/native-decls/GetVehicleXenonLightsCustomColor.md
index 76f0788aab..9697f81bb7 100644
--- a/ext/native-decls/GetVehicleXenonLightsCustomColor.md
+++ b/ext/native-decls/GetVehicleXenonLightsCustomColor.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_VEHICLE_XENON_LIGHTS_CUSTOM_COLOR
 
diff --git a/ext/native-decls/GetWeaponAnimationOverride.md b/ext/native-decls/GetWeaponAnimationOverride.md
index 466a0d3470..ca6943397f 100644
--- a/ext/native-decls/GetWeaponAnimationOverride.md
+++ b/ext/native-decls/GetWeaponAnimationOverride.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_WEAPON_ANIMATION_OVERRIDE
 
diff --git a/ext/native-decls/GetWeaponComponentAccuracyModifier.md b/ext/native-decls/GetWeaponComponentAccuracyModifier.md
index 72dac56bd3..dfe33e801b 100644
--- a/ext/native-decls/GetWeaponComponentAccuracyModifier.md
+++ b/ext/native-decls/GetWeaponComponentAccuracyModifier.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_WEAPON_COMPONENT_ACCURACY_MODIFIER
 
diff --git a/ext/native-decls/GetWeaponComponentCameraHash.md b/ext/native-decls/GetWeaponComponentCameraHash.md
index c4ee78a3d1..7b8aca5381 100644
--- a/ext/native-decls/GetWeaponComponentCameraHash.md
+++ b/ext/native-decls/GetWeaponComponentCameraHash.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_WEAPON_COMPONENT_CAMERA_HASH
 
diff --git a/ext/native-decls/GetWeaponComponentClipSize.md b/ext/native-decls/GetWeaponComponentClipSize.md
index f5303c0380..91a92a0e9a 100644
--- a/ext/native-decls/GetWeaponComponentClipSize.md
+++ b/ext/native-decls/GetWeaponComponentClipSize.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_WEAPON_COMPONENT_CLIP_SIZE
 
diff --git a/ext/native-decls/GetWeaponComponentDamageModifier.md b/ext/native-decls/GetWeaponComponentDamageModifier.md
index 0ba37a5ffa..8f0794bd53 100644
--- a/ext/native-decls/GetWeaponComponentDamageModifier.md
+++ b/ext/native-decls/GetWeaponComponentDamageModifier.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_WEAPON_COMPONENT_DAMAGE_MODIFIER
 
diff --git a/ext/native-decls/GetWeaponComponentRangeDamageModifier.md b/ext/native-decls/GetWeaponComponentRangeDamageModifier.md
index e65c2cfbb8..5856717739 100644
--- a/ext/native-decls/GetWeaponComponentRangeDamageModifier.md
+++ b/ext/native-decls/GetWeaponComponentRangeDamageModifier.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_WEAPON_COMPONENT_RANGE_DAMAGE_MODIFIER
 
diff --git a/ext/native-decls/GetWeaponComponentRangeModifier.md b/ext/native-decls/GetWeaponComponentRangeModifier.md
index c68d3a8d01..04b7db1453 100644
--- a/ext/native-decls/GetWeaponComponentRangeModifier.md
+++ b/ext/native-decls/GetWeaponComponentRangeModifier.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_WEAPON_COMPONENT_RANGE_MODIFIER
 
diff --git a/ext/native-decls/GetWeaponComponentReticuleHash.md b/ext/native-decls/GetWeaponComponentReticuleHash.md
index 2eb6973043..db14ffc780 100644
--- a/ext/native-decls/GetWeaponComponentReticuleHash.md
+++ b/ext/native-decls/GetWeaponComponentReticuleHash.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_WEAPON_COMPONENT_RETICULE_HASH
 
diff --git a/ext/native-decls/GetWeaponDamageModifier.md b/ext/native-decls/GetWeaponDamageModifier.md
index d39dfb3854..b742c8e35d 100644
--- a/ext/native-decls/GetWeaponDamageModifier.md
+++ b/ext/native-decls/GetWeaponDamageModifier.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_WEAPON_DAMAGE_MODIFIER
 
diff --git a/ext/native-decls/GetWeaponRecoilShakeAmplitude.md b/ext/native-decls/GetWeaponRecoilShakeAmplitude.md
index c5cd22dc41..781c14374d 100644
--- a/ext/native-decls/GetWeaponRecoilShakeAmplitude.md
+++ b/ext/native-decls/GetWeaponRecoilShakeAmplitude.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## GET_WEAPON_RECOIL_SHAKE_AMPLITUDE
 
diff --git a/ext/native-decls/GetWorldCoordFromScreenCoord.md b/ext/native-decls/GetWorldCoordFromScreenCoord.md
index 2a0ab47511..1adf855b4d 100644
--- a/ext/native-decls/GetWorldCoordFromScreenCoord.md
+++ b/ext/native-decls/GetWorldCoordFromScreenCoord.md
@@ -2,7 +2,6 @@
 ns: CFX
 apiset: client
 ---
-
 ## GET_WORLD_COORD_FROM_SCREEN_COORD
 
 ```c
diff --git a/ext/native-decls/HasMinimapOverlayLoaded.md b/ext/native-decls/HasMinimapOverlayLoaded.md
index 0b240462ff..5bd7dcee40 100644
--- a/ext/native-decls/HasMinimapOverlayLoaded.md
+++ b/ext/native-decls/HasMinimapOverlayLoaded.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## HAS_MINIMAP_OVERLAY_LOADED
 
diff --git a/ext/native-decls/IsBigmapActive.md b/ext/native-decls/IsBigmapActive.md
index f387b08cb0..46db9493c8 100644
--- a/ext/native-decls/IsBigmapActive.md
+++ b/ext/native-decls/IsBigmapActive.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## IS_BIGMAP_ACTIVE
 
diff --git a/ext/native-decls/IsBigmapFull.md b/ext/native-decls/IsBigmapFull.md
index a2bd05ef17..05bbe5d255 100644
--- a/ext/native-decls/IsBigmapFull.md
+++ b/ext/native-decls/IsBigmapFull.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## IS_BIGMAP_FULL
 
diff --git a/ext/native-decls/IsEntityPositionFrozen.md b/ext/native-decls/IsEntityPositionFrozen.md
index 079d4641f7..1334a05b64 100644
--- a/ext/native-decls/IsEntityPositionFrozen.md
+++ b/ext/native-decls/IsEntityPositionFrozen.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: shared
+game: gta5
 ---
 ## IS_ENTITY_POSITION_FROZEN
 
diff --git a/ext/native-decls/IsStreamingFileReady.md b/ext/native-decls/IsStreamingFileReady.md
index ab5bf40436..dd24698cab 100644
--- a/ext/native-decls/IsStreamingFileReady.md
+++ b/ext/native-decls/IsStreamingFileReady.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## IS_STREAMING_FILE_READY
 
diff --git a/ext/native-decls/IsVehicleAlarmSet.md b/ext/native-decls/IsVehicleAlarmSet.md
index e3f0414262..0990c03fa4 100644
--- a/ext/native-decls/IsVehicleAlarmSet.md
+++ b/ext/native-decls/IsVehicleAlarmSet.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## IS_VEHICLE_ALARM_SET
 
diff --git a/ext/native-decls/IsVehicleEngineStarting.md b/ext/native-decls/IsVehicleEngineStarting.md
index 806f45c499..b4e26e14bd 100644
--- a/ext/native-decls/IsVehicleEngineStarting.md
+++ b/ext/native-decls/IsVehicleEngineStarting.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: shared
+game: gta5
 ---
 ## IS_VEHICLE_ENGINE_STARTING
 
diff --git a/ext/native-decls/IsVehicleInteriorLightOn.md b/ext/native-decls/IsVehicleInteriorLightOn.md
index 366943e0b5..4dcdac1ee7 100644
--- a/ext/native-decls/IsVehicleInteriorLightOn.md
+++ b/ext/native-decls/IsVehicleInteriorLightOn.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## IS_VEHICLE_INTERIOR_LIGHT_ON
 
diff --git a/ext/native-decls/IsVehicleNeedsToBeHotwired.md b/ext/native-decls/IsVehicleNeedsToBeHotwired.md
index dc3602e65c..74ed5077bf 100644
--- a/ext/native-decls/IsVehicleNeedsToBeHotwired.md
+++ b/ext/native-decls/IsVehicleNeedsToBeHotwired.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## IS_VEHICLE_NEEDS_TO_BE_HOTWIRED
 
diff --git a/ext/native-decls/IsVehiclePreviouslyOwnedByPlayer.md b/ext/native-decls/IsVehiclePreviouslyOwnedByPlayer.md
index 290a15530f..faa7087397 100644
--- a/ext/native-decls/IsVehiclePreviouslyOwnedByPlayer.md
+++ b/ext/native-decls/IsVehiclePreviouslyOwnedByPlayer.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## IS_VEHICLE_PREVIOUSLY_OWNED_BY_PLAYER
 
diff --git a/ext/native-decls/IsVehicleWanted.md b/ext/native-decls/IsVehicleWanted.md
index fe919823ff..3692461c48 100644
--- a/ext/native-decls/IsVehicleWanted.md
+++ b/ext/native-decls/IsVehicleWanted.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## IS_VEHICLE_WANTED
 
diff --git a/ext/native-decls/RegisterArchetypes.md b/ext/native-decls/RegisterArchetypes.md
index 8bb3438933..2503569f6c 100644
--- a/ext/native-decls/RegisterArchetypes.md
+++ b/ext/native-decls/RegisterArchetypes.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## REGISTER_ARCHETYPES
 
diff --git a/ext/native-decls/RegisterEntities.md b/ext/native-decls/RegisterEntities.md
index 1f14f6101b..0928f5e2cc 100644
--- a/ext/native-decls/RegisterEntities.md
+++ b/ext/native-decls/RegisterEntities.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## REGISTER_ENTITIES
 
diff --git a/ext/native-decls/RegisterFontFile.md b/ext/native-decls/RegisterFontFile.md
index 9103ef5d45..9562c4ac49 100644
--- a/ext/native-decls/RegisterFontFile.md
+++ b/ext/native-decls/RegisterFontFile.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## REGISTER_FONT_FILE
 
diff --git a/ext/native-decls/RegisterFontId.md b/ext/native-decls/RegisterFontId.md
index fe66ebc522..d567a49e4b 100644
--- a/ext/native-decls/RegisterFontId.md
+++ b/ext/native-decls/RegisterFontId.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## REGISTER_FONT_ID
 
diff --git a/ext/native-decls/RegisterKeyMapping.md b/ext/native-decls/RegisterKeyMapping.md
index 240c3c4eb0..d5ce1dfae6 100644
--- a/ext/native-decls/RegisterKeyMapping.md
+++ b/ext/native-decls/RegisterKeyMapping.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## REGISTER_KEY_MAPPING
 
diff --git a/ext/native-decls/RegisterStreamingFileFromCache.md b/ext/native-decls/RegisterStreamingFileFromCache.md
index f3053529b4..33f183a5ac 100644
--- a/ext/native-decls/RegisterStreamingFileFromCache.md
+++ b/ext/native-decls/RegisterStreamingFileFromCache.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## REGISTER_STREAMING_FILE_FROM_CACHE
 
diff --git a/ext/native-decls/RegisterStreamingFileFromKvs.md b/ext/native-decls/RegisterStreamingFileFromKvs.md
index deea47e711..39c49e3396 100644
--- a/ext/native-decls/RegisterStreamingFileFromKvs.md
+++ b/ext/native-decls/RegisterStreamingFileFromKvs.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## REGISTER_STREAMING_FILE_FROM_KVS
 
diff --git a/ext/native-decls/RegisterStreamingFileFromUrl.md b/ext/native-decls/RegisterStreamingFileFromUrl.md
index 14b52d371b..18fe166683 100644
--- a/ext/native-decls/RegisterStreamingFileFromUrl.md
+++ b/ext/native-decls/RegisterStreamingFileFromUrl.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## REGISTER_STREAMING_FILE_FROM_URL
 
diff --git a/ext/native-decls/RemoveDryVolume.md b/ext/native-decls/RemoveDryVolume.md
index 9ac84263d9..41fbf0b587 100644
--- a/ext/native-decls/RemoveDryVolume.md
+++ b/ext/native-decls/RemoveDryVolume.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## REMOVE_DRY_VOLUME
 
diff --git a/ext/native-decls/RemoveReplaceTexture.md b/ext/native-decls/RemoveReplaceTexture.md
index a437aecbfe..0cfa949cab 100644
--- a/ext/native-decls/RemoveReplaceTexture.md
+++ b/ext/native-decls/RemoveReplaceTexture.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## REMOVE_REPLACE_TEXTURE
 
diff --git a/ext/native-decls/RemoveTimecycleModifier.md b/ext/native-decls/RemoveTimecycleModifier.md
index 3e9973d092..4e295e0ee7 100644
--- a/ext/native-decls/RemoveTimecycleModifier.md
+++ b/ext/native-decls/RemoveTimecycleModifier.md
@@ -1,7 +1,6 @@
 ---
 ns: CFX
 apiset: client
-game: gta5
 ---
 ## REMOVE_TIMECYCLE_MODIFIER
 
diff --git a/ext/native-decls/RemoveTimecycleModifierVar.md b/ext/native-decls/RemoveTimecycleModifierVar.md
index d302adaed6..75d74d606e 100644
--- a/ext/native-decls/RemoveTimecycleModifierVar.md
+++ b/ext/native-decls/RemoveTimecycleModifierVar.md
@@ -1,7 +1,6 @@
 ---
 ns: CFX
 apiset: client
-game: gta5
 ---
 ## REMOVE_TIMECYCLE_MODIFIER_VAR
 
diff --git a/ext/native-decls/ResetFlyThroughWindscreenParams.md b/ext/native-decls/ResetFlyThroughWindscreenParams.md
index bc547d8e50..735e762cae 100644
--- a/ext/native-decls/ResetFlyThroughWindscreenParams.md
+++ b/ext/native-decls/ResetFlyThroughWindscreenParams.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## RESET_FLY_THROUGH_WINDSCREEN_PARAMS
 
diff --git a/ext/native-decls/ResetMapZoomDataLevel.md b/ext/native-decls/ResetMapZoomDataLevel.md
index 137759b77f..38b09865dd 100644
--- a/ext/native-decls/ResetMapZoomDataLevel.md
+++ b/ext/native-decls/ResetMapZoomDataLevel.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## RESET_MAP_ZOOM_DATA_LEVEL
 
diff --git a/ext/native-decls/SetAimCooldown.md b/ext/native-decls/SetAimCooldown.md
index 5458296855..08dfd30363 100644
--- a/ext/native-decls/SetAimCooldown.md
+++ b/ext/native-decls/SetAimCooldown.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_AIM_COOLDOWN
 
diff --git a/ext/native-decls/SetBackfaceculling.md b/ext/native-decls/SetBackfaceculling.md
new file mode 100644
index 0000000000..265126095f
--- /dev/null
+++ b/ext/native-decls/SetBackfaceculling.md
@@ -0,0 +1,13 @@
+---
+ns: CFX
+apiset: client
+game: rdr3
+---
+## SET_BACKFACECULLING
+
+```c
+void SET_BACKFACECULLING(BOOL toggle);
+```
+
+## Parameters
+* **toggle**: 
diff --git a/ext/native-decls/SetDrawOrigin.md b/ext/native-decls/SetDrawOrigin.md
new file mode 100644
index 0000000000..ccfe81c23b
--- /dev/null
+++ b/ext/native-decls/SetDrawOrigin.md
@@ -0,0 +1,20 @@
+---
+ns: CFX
+apiset: client
+game: rdr3
+---
+## SET_DRAW_ORIGIN
+
+```c
+void SET_DRAW_ORIGIN(float x, float y, float z, BOOL is2d);
+```
+
+Sets the on-screen drawing origin for draw-functions in world coordinates.
+
+The effect can be reset by calling [`CLEAR_DRAW_ORIGIN`](#_0xDD76B263) and is limited to 32 different origins each frame.
+
+## Parameters
+* **x**: 
+* **y**: 
+* **z**: 
+* **is2d**: 
diff --git a/ext/native-decls/SetFlashLightKeepOnWhileMoving.md b/ext/native-decls/SetFlashLightKeepOnWhileMoving.md
index 6328a74c88..7345814235 100644
--- a/ext/native-decls/SetFlashLightKeepOnWhileMoving.md
+++ b/ext/native-decls/SetFlashLightKeepOnWhileMoving.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_FLASH_LIGHT_KEEP_ON_WHILE_MOVING
 
diff --git a/ext/native-decls/SetFlyThroughWindscreenParams.md b/ext/native-decls/SetFlyThroughWindscreenParams.md
index a34c2854e9..02b3a9bce7 100644
--- a/ext/native-decls/SetFlyThroughWindscreenParams.md
+++ b/ext/native-decls/SetFlyThroughWindscreenParams.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_FLY_THROUGH_WINDSCREEN_PARAMS
 
diff --git a/ext/native-decls/SetHandlingField.md b/ext/native-decls/SetHandlingField.md
index cc17f88abd..cee77bd8cd 100644
--- a/ext/native-decls/SetHandlingField.md
+++ b/ext/native-decls/SetHandlingField.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_HANDLING_FIELD
 
diff --git a/ext/native-decls/SetHandlingFloat.md b/ext/native-decls/SetHandlingFloat.md
index 42b5d5c17d..ee4800869a 100644
--- a/ext/native-decls/SetHandlingFloat.md
+++ b/ext/native-decls/SetHandlingFloat.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_HANDLING_FLOAT
 
diff --git a/ext/native-decls/SetHandlingInt.md b/ext/native-decls/SetHandlingInt.md
index 9c028aca68..6fe42d3cbc 100644
--- a/ext/native-decls/SetHandlingInt.md
+++ b/ext/native-decls/SetHandlingInt.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_HANDLING_INT
 
diff --git a/ext/native-decls/SetHandlingVector.md b/ext/native-decls/SetHandlingVector.md
index 27e8b8815a..2e168d9383 100644
--- a/ext/native-decls/SetHandlingVector.md
+++ b/ext/native-decls/SetHandlingVector.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_HANDLING_VECTOR
 
diff --git a/ext/native-decls/SetInteriorPortalCornerPosition.md b/ext/native-decls/SetInteriorPortalCornerPosition.md
index ba958096fb..94243d4d09 100644
--- a/ext/native-decls/SetInteriorPortalCornerPosition.md
+++ b/ext/native-decls/SetInteriorPortalCornerPosition.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_INTERIOR_PORTAL_CORNER_POSITION
 
diff --git a/ext/native-decls/SetInteriorPortalEntityFlag.md b/ext/native-decls/SetInteriorPortalEntityFlag.md
index 4799500be6..4a9c9d1710 100644
--- a/ext/native-decls/SetInteriorPortalEntityFlag.md
+++ b/ext/native-decls/SetInteriorPortalEntityFlag.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_INTERIOR_PORTAL_ENTITY_FLAG
 
diff --git a/ext/native-decls/SetInteriorPortalFlag.md b/ext/native-decls/SetInteriorPortalFlag.md
index 906c6057cb..7e441c8ff5 100644
--- a/ext/native-decls/SetInteriorPortalFlag.md
+++ b/ext/native-decls/SetInteriorPortalFlag.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_INTERIOR_PORTAL_FLAG
 
diff --git a/ext/native-decls/SetInteriorPortalRoomFrom.md b/ext/native-decls/SetInteriorPortalRoomFrom.md
index 461e1b0846..7ee20eb259 100644
--- a/ext/native-decls/SetInteriorPortalRoomFrom.md
+++ b/ext/native-decls/SetInteriorPortalRoomFrom.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_INTERIOR_PORTAL_ROOM_FROM
 
diff --git a/ext/native-decls/SetInteriorPortalRoomTo.md b/ext/native-decls/SetInteriorPortalRoomTo.md
index 01109d3c63..da1b5d91c0 100644
--- a/ext/native-decls/SetInteriorPortalRoomTo.md
+++ b/ext/native-decls/SetInteriorPortalRoomTo.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_INTERIOR_PORTAL_ROOM_TO
 
diff --git a/ext/native-decls/SetInteriorRoomExtents.md b/ext/native-decls/SetInteriorRoomExtents.md
index eb7ae3d718..431afa698b 100644
--- a/ext/native-decls/SetInteriorRoomExtents.md
+++ b/ext/native-decls/SetInteriorRoomExtents.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_INTERIOR_ROOM_EXTENTS
 
diff --git a/ext/native-decls/SetInteriorRoomFlag.md b/ext/native-decls/SetInteriorRoomFlag.md
index a02701af07..f1bbc336ab 100644
--- a/ext/native-decls/SetInteriorRoomFlag.md
+++ b/ext/native-decls/SetInteriorRoomFlag.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_INTERIOR_ROOM_FLAG
 
diff --git a/ext/native-decls/SetInteriorRoomTimecycle.md b/ext/native-decls/SetInteriorRoomTimecycle.md
index fdaa015969..799567d35b 100644
--- a/ext/native-decls/SetInteriorRoomTimecycle.md
+++ b/ext/native-decls/SetInteriorRoomTimecycle.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_INTERIOR_ROOM_TIMECYCLE
 
diff --git a/ext/native-decls/SetManualShutdownLoadingScreenNui.md b/ext/native-decls/SetManualShutdownLoadingScreenNui.md
index d562e5dba8..f446047dc7 100644
--- a/ext/native-decls/SetManualShutdownLoadingScreenNui.md
+++ b/ext/native-decls/SetManualShutdownLoadingScreenNui.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+#game: gta5 // commented out for compatibility reasons
 ---
 ## SET_MANUAL_SHUTDOWN_LOADING_SCREEN_NUI
 
diff --git a/ext/native-decls/SetMapZoomDataLevel.md b/ext/native-decls/SetMapZoomDataLevel.md
index 331f8417b4..5cc1f54d14 100644
--- a/ext/native-decls/SetMapZoomDataLevel.md
+++ b/ext/native-decls/SetMapZoomDataLevel.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_MAP_ZOOM_DATA_LEVEL
 
diff --git a/ext/native-decls/SetMillisecondsPerGameMinute.md b/ext/native-decls/SetMillisecondsPerGameMinute.md
index 92b4a584d4..de7bad224e 100644
--- a/ext/native-decls/SetMillisecondsPerGameMinute.md
+++ b/ext/native-decls/SetMillisecondsPerGameMinute.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_MILLISECONDS_PER_GAME_MINUTE
 
diff --git a/ext/native-decls/SetMinimapOverlayDisplay.md b/ext/native-decls/SetMinimapOverlayDisplay.md
index 90b0286168..2a10d2bbec 100644
--- a/ext/native-decls/SetMinimapOverlayDisplay.md
+++ b/ext/native-decls/SetMinimapOverlayDisplay.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_MINIMAP_OVERLAY_DISPLAY
 
diff --git a/ext/native-decls/SetModelHeadlightConfiguration.md b/ext/native-decls/SetModelHeadlightConfiguration.md
index 9f5761ee75..f79cfe1f68 100644
--- a/ext/native-decls/SetModelHeadlightConfiguration.md
+++ b/ext/native-decls/SetModelHeadlightConfiguration.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_MODEL_HEADLIGHT_CONFIGURATION
 
@@ -8,6 +9,7 @@ apiset: client
 void SET_MODEL_HEADLIGHT_CONFIGURATION(Hash modelHash, float ratePerSecond, float headlightRotation, BOOL invertRotation);
 ```
 
+**This native is deprecated and does nothing!**
 
 ## Parameters
 * **modelHash**: 
diff --git a/ext/native-decls/SetMpGamerTagsUseVehicleBehavior.md b/ext/native-decls/SetMpGamerTagsUseVehicleBehavior.md
index 95a222de36..c22e5018f6 100644
--- a/ext/native-decls/SetMpGamerTagsUseVehicleBehavior.md
+++ b/ext/native-decls/SetMpGamerTagsUseVehicleBehavior.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_MP_GAMER_TAGS_USE_VEHICLE_BEHAVIOR
 
diff --git a/ext/native-decls/SetMpGamerTagsVisibleDistance.md b/ext/native-decls/SetMpGamerTagsVisibleDistance.md
index bbf6b6d156..2338610a51 100644
--- a/ext/native-decls/SetMpGamerTagsVisibleDistance.md
+++ b/ext/native-decls/SetMpGamerTagsVisibleDistance.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_MP_GAMER_TAGS_VISIBLE_DISTANCE
 
diff --git a/ext/native-decls/SetPedTurningThresholds.md b/ext/native-decls/SetPedTurningThresholds.md
index 6e78c4e610..906acfe26a 100644
--- a/ext/native-decls/SetPedTurningThresholds.md
+++ b/ext/native-decls/SetPedTurningThresholds.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_PED_TURNING_THRESHOLDS
 
diff --git a/ext/native-decls/SetRopeLengthChangeRate.md b/ext/native-decls/SetRopeLengthChangeRate.md
index e0746151bc..d21fa8efac 100644
--- a/ext/native-decls/SetRopeLengthChangeRate.md
+++ b/ext/native-decls/SetRopeLengthChangeRate.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_ROPE_LENGTH_CHANGE_RATE
 
diff --git a/ext/native-decls/SetRopesCreateNetworkWorldState.md b/ext/native-decls/SetRopesCreateNetworkWorldState.md
index ab34e3907f..eb7a96340b 100644
--- a/ext/native-decls/SetRopesCreateNetworkWorldState.md
+++ b/ext/native-decls/SetRopesCreateNetworkWorldState.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_ROPES_CREATE_NETWORK_WORLD_STATE
 
diff --git a/ext/native-decls/SetRuntimeTextureArgbData.md b/ext/native-decls/SetRuntimeTextureArgbData.md
index 8ff7756484..8337598aa5 100644
--- a/ext/native-decls/SetRuntimeTextureArgbData.md
+++ b/ext/native-decls/SetRuntimeTextureArgbData.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_RUNTIME_TEXTURE_ARGB_DATA
 
diff --git a/ext/native-decls/SetRuntimeTextureImage.md b/ext/native-decls/SetRuntimeTextureImage.md
index d6a3e8a592..d758ebcf8d 100644
--- a/ext/native-decls/SetRuntimeTextureImage.md
+++ b/ext/native-decls/SetRuntimeTextureImage.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_RUNTIME_TEXTURE_IMAGE
 
diff --git a/ext/native-decls/SetRuntimeTexturePixel.md b/ext/native-decls/SetRuntimeTexturePixel.md
index 39e9b23291..2c3c0af03f 100644
--- a/ext/native-decls/SetRuntimeTexturePixel.md
+++ b/ext/native-decls/SetRuntimeTexturePixel.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_RUNTIME_TEXTURE_PIXEL
 
diff --git a/ext/native-decls/SetTextChatEnabled.md b/ext/native-decls/SetTextChatEnabled.md
index 328fd0dcb5..12e683dfd6 100644
--- a/ext/native-decls/SetTextChatEnabled.md
+++ b/ext/native-decls/SetTextChatEnabled.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+#game: gta5 // commented out for compatibility reasons
 ---
 ## SET_TEXT_CHAT_ENABLED
 
diff --git a/ext/native-decls/SetTextJustification.md b/ext/native-decls/SetTextJustification.md
new file mode 100644
index 0000000000..ebfd03aa0c
--- /dev/null
+++ b/ext/native-decls/SetTextJustification.md
@@ -0,0 +1,13 @@
+---
+ns: CFX
+apiset: client
+game: rdr3
+---
+## SET_TEXT_JUSTIFICATION
+
+```c
+void SET_TEXT_JUSTIFICATION(int justifyType);
+```
+
+## Parameters
+* **justifyType**: 
diff --git a/ext/native-decls/SetTextWrap.md b/ext/native-decls/SetTextWrap.md
new file mode 100644
index 0000000000..a14ebb97f7
--- /dev/null
+++ b/ext/native-decls/SetTextWrap.md
@@ -0,0 +1,14 @@
+---
+ns: CFX
+apiset: client
+game: rdr3
+---
+## SET_TEXT_WRAP
+
+```c
+void SET_TEXT_WRAP(float start, float end);
+```
+
+## Parameters
+* **start**: 
+* **end**: 
diff --git a/ext/native-decls/SetTimecycleModifierVar.md b/ext/native-decls/SetTimecycleModifierVar.md
index d180f039b2..5549ad8898 100644
--- a/ext/native-decls/SetTimecycleModifierVar.md
+++ b/ext/native-decls/SetTimecycleModifierVar.md
@@ -1,7 +1,6 @@
 ---
 ns: CFX
 apiset: client
-game: gta5
 ---
 ## SET_TIMECYCLE_MODIFIER_VAR
 
diff --git a/ext/native-decls/SetTrainDoorOpenRatio.md b/ext/native-decls/SetTrainDoorOpenRatio.md
index 05dfdea39c..6bcce5cb1c 100644
--- a/ext/native-decls/SetTrainDoorOpenRatio.md
+++ b/ext/native-decls/SetTrainDoorOpenRatio.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_TRAIN_DOOR_OPEN_RATIO
 
diff --git a/ext/native-decls/SetTrainsForceDoorsOpen.md b/ext/native-decls/SetTrainsForceDoorsOpen.md
index 71d2462d70..34f28595a1 100644
--- a/ext/native-decls/SetTrainsForceDoorsOpen.md
+++ b/ext/native-decls/SetTrainsForceDoorsOpen.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_TRAINS_FORCE_DOORS_OPEN
 
diff --git a/ext/native-decls/SetVehicleAlarmTimeLeft.md b/ext/native-decls/SetVehicleAlarmTimeLeft.md
index dec8cca5c9..6ae5499884 100644
--- a/ext/native-decls/SetVehicleAlarmTimeLeft.md
+++ b/ext/native-decls/SetVehicleAlarmTimeLeft.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_ALARM_TIME_LEFT
 
diff --git a/ext/native-decls/SetVehicleAutoRepairDisabled.md b/ext/native-decls/SetVehicleAutoRepairDisabled.md
index 0d5e9973fd..c09a174751 100644
--- a/ext/native-decls/SetVehicleAutoRepairDisabled.md
+++ b/ext/native-decls/SetVehicleAutoRepairDisabled.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_AUTO_REPAIR_DISABLED
 
diff --git a/ext/native-decls/SetVehicleClutch.md b/ext/native-decls/SetVehicleClutch.md
index e9cfb26371..47039beb00 100644
--- a/ext/native-decls/SetVehicleClutch.md
+++ b/ext/native-decls/SetVehicleClutch.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_CLUTCH
 
diff --git a/ext/native-decls/SetVehicleCurrentRpm.md b/ext/native-decls/SetVehicleCurrentRpm.md
index 4828f297ef..dc6b3f505c 100644
--- a/ext/native-decls/SetVehicleCurrentRpm.md
+++ b/ext/native-decls/SetVehicleCurrentRpm.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_CURRENT_RPM
 
diff --git a/ext/native-decls/SetVehicleEngineTemperature.md b/ext/native-decls/SetVehicleEngineTemperature.md
index e77b7e1068..2a1b1873a6 100644
--- a/ext/native-decls/SetVehicleEngineTemperature.md
+++ b/ext/native-decls/SetVehicleEngineTemperature.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_ENGINE_TEMPERATURE
 
diff --git a/ext/native-decls/SetVehicleFuelLevel.md b/ext/native-decls/SetVehicleFuelLevel.md
index f45255b943..31978bddec 100644
--- a/ext/native-decls/SetVehicleFuelLevel.md
+++ b/ext/native-decls/SetVehicleFuelLevel.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_FUEL_LEVEL
 
diff --git a/ext/native-decls/SetVehicleGravityAmount.md b/ext/native-decls/SetVehicleGravityAmount.md
index b59ac3021c..3e7e227262 100644
--- a/ext/native-decls/SetVehicleGravityAmount.md
+++ b/ext/native-decls/SetVehicleGravityAmount.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_GRAVITY_AMOUNT
 
diff --git a/ext/native-decls/SetVehicleHandlingField.md b/ext/native-decls/SetVehicleHandlingField.md
index 103bbedcbb..6e20619bd3 100644
--- a/ext/native-decls/SetVehicleHandlingField.md
+++ b/ext/native-decls/SetVehicleHandlingField.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_HANDLING_FIELD
 
diff --git a/ext/native-decls/SetVehicleHandlingFloat.md b/ext/native-decls/SetVehicleHandlingFloat.md
index 03e6785081..7f2712c560 100644
--- a/ext/native-decls/SetVehicleHandlingFloat.md
+++ b/ext/native-decls/SetVehicleHandlingFloat.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_HANDLING_FLOAT
 
diff --git a/ext/native-decls/SetVehicleHandlingInt.md b/ext/native-decls/SetVehicleHandlingInt.md
index e0978faf4e..d5f03b3536 100644
--- a/ext/native-decls/SetVehicleHandlingInt.md
+++ b/ext/native-decls/SetVehicleHandlingInt.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_HANDLING_INT
 
diff --git a/ext/native-decls/SetVehicleHandlingVector.md b/ext/native-decls/SetVehicleHandlingVector.md
index 0d0b7b3d30..630db62469 100644
--- a/ext/native-decls/SetVehicleHandlingVector.md
+++ b/ext/native-decls/SetVehicleHandlingVector.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_HANDLING_VECTOR
 
diff --git a/ext/native-decls/SetVehicleHighGear.md b/ext/native-decls/SetVehicleHighGear.md
index 461942c0e0..887c53355a 100644
--- a/ext/native-decls/SetVehicleHighGear.md
+++ b/ext/native-decls/SetVehicleHighGear.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_HIGH_GEAR
 
diff --git a/ext/native-decls/SetVehicleOilLevel.md b/ext/native-decls/SetVehicleOilLevel.md
index 878ef9882c..afd8ac7089 100644
--- a/ext/native-decls/SetVehicleOilLevel.md
+++ b/ext/native-decls/SetVehicleOilLevel.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_OIL_LEVEL
 
diff --git a/ext/native-decls/SetVehiclePitchBias.md b/ext/native-decls/SetVehiclePitchBias.md
index 483bc5e4bb..d602621e12 100644
--- a/ext/native-decls/SetVehiclePitchBias.md
+++ b/ext/native-decls/SetVehiclePitchBias.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_PITCH_BIAS
 
diff --git a/ext/native-decls/SetVehicleRollBias.md b/ext/native-decls/SetVehicleRollBias.md
index d81de4d98c..340d9cface 100644
--- a/ext/native-decls/SetVehicleRollBias.md
+++ b/ext/native-decls/SetVehicleRollBias.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_ROLL_BIAS
 
diff --git a/ext/native-decls/SetVehicleSteeringAngle.md b/ext/native-decls/SetVehicleSteeringAngle.md
index d7456524cd..c5b0671acc 100644
--- a/ext/native-decls/SetVehicleSteeringAngle.md
+++ b/ext/native-decls/SetVehicleSteeringAngle.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_STEERING_ANGLE
 
diff --git a/ext/native-decls/SetVehicleSteeringScale.md b/ext/native-decls/SetVehicleSteeringScale.md
index 674f4230db..45645cae9d 100644
--- a/ext/native-decls/SetVehicleSteeringScale.md
+++ b/ext/native-decls/SetVehicleSteeringScale.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_STEERING_SCALE
 
diff --git a/ext/native-decls/SetVehicleSuspensionHeight.md b/ext/native-decls/SetVehicleSuspensionHeight.md
index 90a468ad13..beb399f8af 100644
--- a/ext/native-decls/SetVehicleSuspensionHeight.md
+++ b/ext/native-decls/SetVehicleSuspensionHeight.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_SUSPENSION_HEIGHT
 
diff --git a/ext/native-decls/SetVehicleTurboPressure.md b/ext/native-decls/SetVehicleTurboPressure.md
index a671a93944..3c5787d9e9 100644
--- a/ext/native-decls/SetVehicleTurboPressure.md
+++ b/ext/native-decls/SetVehicleTurboPressure.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_TURBO_PRESSURE
 
diff --git a/ext/native-decls/SetVehicleWheelBrakePressure.md b/ext/native-decls/SetVehicleWheelBrakePressure.md
index 0e507d7494..333903d2a2 100644
--- a/ext/native-decls/SetVehicleWheelBrakePressure.md
+++ b/ext/native-decls/SetVehicleWheelBrakePressure.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_WHEEL_BRAKE_PRESSURE
 
diff --git a/ext/native-decls/SetVehicleWheelFlags.md b/ext/native-decls/SetVehicleWheelFlags.md
index 996f286816..b35911cf14 100644
--- a/ext/native-decls/SetVehicleWheelFlags.md
+++ b/ext/native-decls/SetVehicleWheelFlags.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_WHEEL_FLAGS
 
diff --git a/ext/native-decls/SetVehicleWheelHealth.md b/ext/native-decls/SetVehicleWheelHealth.md
index 7b73a50915..629e4f7bb7 100644
--- a/ext/native-decls/SetVehicleWheelHealth.md
+++ b/ext/native-decls/SetVehicleWheelHealth.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_WHEEL_HEALTH
 
diff --git a/ext/native-decls/SetVehicleWheelIsPowered.md b/ext/native-decls/SetVehicleWheelIsPowered.md
index 938f3c3d10..a00cda5dd7 100644
--- a/ext/native-decls/SetVehicleWheelIsPowered.md
+++ b/ext/native-decls/SetVehicleWheelIsPowered.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_WHEEL_IS_POWERED
 
diff --git a/ext/native-decls/SetVehicleWheelPower.md b/ext/native-decls/SetVehicleWheelPower.md
index 498c0f44f5..5809715ffc 100644
--- a/ext/native-decls/SetVehicleWheelPower.md
+++ b/ext/native-decls/SetVehicleWheelPower.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_WHEEL_POWER
 
diff --git a/ext/native-decls/SetVehicleWheelRimColliderSize.md b/ext/native-decls/SetVehicleWheelRimColliderSize.md
index 5fc918a9f2..bfaada32ba 100644
--- a/ext/native-decls/SetVehicleWheelRimColliderSize.md
+++ b/ext/native-decls/SetVehicleWheelRimColliderSize.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_WHEEL_RIM_COLLIDER_SIZE
 
diff --git a/ext/native-decls/SetVehicleWheelRotationSpeed.md b/ext/native-decls/SetVehicleWheelRotationSpeed.md
index 9b55e9ce79..760496575c 100644
--- a/ext/native-decls/SetVehicleWheelRotationSpeed.md
+++ b/ext/native-decls/SetVehicleWheelRotationSpeed.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_WHEEL_ROTATION_SPEED
 
diff --git a/ext/native-decls/SetVehicleWheelSize.md b/ext/native-decls/SetVehicleWheelSize.md
index 330bde1213..7e7638596e 100644
--- a/ext/native-decls/SetVehicleWheelSize.md
+++ b/ext/native-decls/SetVehicleWheelSize.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_WHEEL_SIZE
 
diff --git a/ext/native-decls/SetVehicleWheelTireColliderSize.md b/ext/native-decls/SetVehicleWheelTireColliderSize.md
index 94f607299d..218eb19c66 100644
--- a/ext/native-decls/SetVehicleWheelTireColliderSize.md
+++ b/ext/native-decls/SetVehicleWheelTireColliderSize.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_WHEEL_TIRE_COLLIDER_SIZE
 
diff --git a/ext/native-decls/SetVehicleWheelTireColliderWidth.md b/ext/native-decls/SetVehicleWheelTireColliderWidth.md
index d28e92f7a7..afaeacb572 100644
--- a/ext/native-decls/SetVehicleWheelTireColliderWidth.md
+++ b/ext/native-decls/SetVehicleWheelTireColliderWidth.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_WHEEL_TIRE_COLLIDER_WIDTH
 
diff --git a/ext/native-decls/SetVehicleWheelTractionVectorLength.md b/ext/native-decls/SetVehicleWheelTractionVectorLength.md
index 553a10ba37..5df9121eaf 100644
--- a/ext/native-decls/SetVehicleWheelTractionVectorLength.md
+++ b/ext/native-decls/SetVehicleWheelTractionVectorLength.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_WHEEL_TRACTION_VECTOR_LENGTH
 
diff --git a/ext/native-decls/SetVehicleWheelWidth.md b/ext/native-decls/SetVehicleWheelWidth.md
index 61deaf895e..3742da038a 100644
--- a/ext/native-decls/SetVehicleWheelWidth.md
+++ b/ext/native-decls/SetVehicleWheelWidth.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_WHEEL_WIDTH
 
diff --git a/ext/native-decls/SetVehicleWheelXOffset.md b/ext/native-decls/SetVehicleWheelXOffset.md
index e67630b6a7..8f7efbcd70 100644
--- a/ext/native-decls/SetVehicleWheelXOffset.md
+++ b/ext/native-decls/SetVehicleWheelXOffset.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_WHEEL_X_OFFSET
 
diff --git a/ext/native-decls/SetVehicleWheelYRotation.md b/ext/native-decls/SetVehicleWheelYRotation.md
index 9db07d1f0c..8a171d45a9 100644
--- a/ext/native-decls/SetVehicleWheelYRotation.md
+++ b/ext/native-decls/SetVehicleWheelYRotation.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 aliases: ["SET_VEHICLE_WHEEL_XROT"]
 ---
 ## SET_VEHICLE_WHEEL_Y_ROTATION
diff --git a/ext/native-decls/SetVehicleWheelieState.md b/ext/native-decls/SetVehicleWheelieState.md
index 927bf1dcba..3fab5d299c 100644
--- a/ext/native-decls/SetVehicleWheelieState.md
+++ b/ext/native-decls/SetVehicleWheelieState.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_WHEELIE_STATE
 
diff --git a/ext/native-decls/SetVehicleXenonLightsCustomColor.md b/ext/native-decls/SetVehicleXenonLightsCustomColor.md
index 9eea10d490..60cbc19e96 100644
--- a/ext/native-decls/SetVehicleXenonLightsCustomColor.md
+++ b/ext/native-decls/SetVehicleXenonLightsCustomColor.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_VEHICLE_XENON_LIGHTS_CUSTOM_COLOR
 
diff --git a/ext/native-decls/SetWaterAreaClipRect.md b/ext/native-decls/SetWaterAreaClipRect.md
index 86946862f9..f5e5653c13 100644
--- a/ext/native-decls/SetWaterAreaClipRect.md
+++ b/ext/native-decls/SetWaterAreaClipRect.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_WATER_AREA_CLIP_RECT
 
diff --git a/ext/native-decls/SetWeaponRecoilShakeAmplitude.md b/ext/native-decls/SetWeaponRecoilShakeAmplitude.md
index 3416d3e8c7..f20c35bbfa 100644
--- a/ext/native-decls/SetWeaponRecoilShakeAmplitude.md
+++ b/ext/native-decls/SetWeaponRecoilShakeAmplitude.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_WEAPON_RECOIL_SHAKE_AMPLITUDE
 
diff --git a/ext/native-decls/SetWeaponsNoAimBlocking.md b/ext/native-decls/SetWeaponsNoAimBlocking.md
index 432a6e209a..7adcdb920e 100644
--- a/ext/native-decls/SetWeaponsNoAimBlocking.md
+++ b/ext/native-decls/SetWeaponsNoAimBlocking.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_WEAPONS_NO_AIM_BLOCKING
 
diff --git a/ext/native-decls/SetWeaponsNoAutoReload.md b/ext/native-decls/SetWeaponsNoAutoReload.md
index beaae603ad..1556ed5424 100644
--- a/ext/native-decls/SetWeaponsNoAutoReload.md
+++ b/ext/native-decls/SetWeaponsNoAutoReload.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_WEAPONS_NO_AUTORELOAD
 
diff --git a/ext/native-decls/SetWeaponsNoAutoSwap.md b/ext/native-decls/SetWeaponsNoAutoSwap.md
index b75e742923..fccc65f381 100644
--- a/ext/native-decls/SetWeaponsNoAutoSwap.md
+++ b/ext/native-decls/SetWeaponsNoAutoSwap.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+game: gta5
 ---
 ## SET_WEAPONS_NO_AUTOSWAP
 
diff --git a/ext/native-decls/SetWeatherOwnedByNetwork.md b/ext/native-decls/SetWeatherOwnedByNetwork.md
index bdec1e5bfc..3f0101784a 100644
--- a/ext/native-decls/SetWeatherOwnedByNetwork.md
+++ b/ext/native-decls/SetWeatherOwnedByNetwork.md
@@ -1,7 +1,6 @@
 ---
 ns: CFX
 apiset: client
-game: gta5
 ---
 ## SET_WEATHER_OWNED_BY_NETWORK
 
diff --git a/ext/native-decls/ShutdownLoadingScreenNui.md b/ext/native-decls/ShutdownLoadingScreenNui.md
index 0f3480fa04..4e033f7d17 100644
--- a/ext/native-decls/ShutdownLoadingScreenNui.md
+++ b/ext/native-decls/ShutdownLoadingScreenNui.md
@@ -1,6 +1,7 @@
 ---
 ns: CFX
 apiset: client
+#game: gta5 // commented out for compatibility reasons
 ---
 ## SHUTDOWN_LOADING_SCREEN_NUI