2.7 Nightly 20 October 2021

Author: serpentiem

Core/Core.ixx

@@ -3076,8 +3076,17 @@ export bool Core_Memory_Init()
 
 	Log("%u %s", moduleEntry.th32ProcessID, moduleEntry.szModule);
 
+
+
+	#ifdef _WIN64
 	Log("appStart %llX", appBaseAddr);
 	Log("appEnd   %llX", (appBaseAddr + appSize));
+	#else
+	Log("appStart %X", appBaseAddr);
+	Log("appEnd   %X", (appBaseAddr + appSize));
+	#endif
+
+
 
 	Log("appSize %X", appSize);
 

Global.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #define DDMK_NAME "DDMK 2.7"
-#define DDMK_DATE "Nightly 18 October 2021"
+#define DDMK_DATE "Nightly 20 October 2021"
 
 #define DDMK_TITLE_EVA   DDMK_NAME " Eva "   DDMK_DATE
 #define DDMK_TITLE_LUCIA DDMK_NAME " Lucia " DDMK_DATE

Kyrie/Actor.ixx

@@ -1166,6 +1166,48 @@ export void EventSpawnMainActor(byte8 * actorBaseAddr)
 	SpawnPlayerActors();
 }
 
+export void EventCutsceneStart()
+{
+	if (!activeConfig.Actor.enable)
+	{
+		return;
+	}
+
+	LogFunction();
+
+
+
+	for_all(playerIndex, activeConfig.Actor.playerCount)
+	{
+		auto & newActorData = g_newActorData[playerIndex];
+
+		IntroduceData(newActorData.baseAddr, actorData, PlayerActorData, continue);
+
+		actorData.enable = false;
+	}
+}
+
+export void EventCutsceneEnd()
+{
+	if (!activeConfig.Actor.enable)
+	{
+		return;
+	}
+
+	LogFunction();
+
+
+
+	for_all(playerIndex, activeConfig.Actor.playerCount)
+	{
+		auto & newActorData = g_newActorData[playerIndex];
+
+		IntroduceData(newActorData.baseAddr, actorData, PlayerActorData, continue);
+
+		actorData.enable = true;
+	}
+}
+
 namespaceEnd();
 
 #pragma endregion

Kyrie/Event.ixx

@@ -181,6 +181,32 @@ void EventHandler()
 
 
 
+
+
+void EventCutsceneStart()
+{
+	LogFunction();
+
+	Actor::EventCutsceneStart();
+}
+
+void EventCutsceneEnd()
+{
+	LogFunction();
+
+	Actor::EventCutsceneEnd();
+}
+
+
+
+
+
+
+
+
+
+
+
 namespaceStart(Event);
 
 export void Toggle(bool enable)
@@ -374,6 +400,92 @@ export void Toggle(bool enable)
 		}
 	}
 
+	// EventCutsceneStart
+	{
+		auto addr     = (appBaseAddr + 0x4C828B);
+		auto jumpAddr = (appBaseAddr + 0x4C8292);
+		constexpr size_t size = 7;
+		/*
+		dmc4.exe+4C828B - 66 89 9E 1D1A0000 - mov [esi+00001A1D],bx
+		dmc4.exe+4C8292 - 8B C6             - mov eax,esi
+		*/
+
+		static Function func = {};
+
+		if (!run)
+		{
+			backupHelper.Save(addr, size);
+			func = CreateFunction(EventCutsceneStart, jumpAddr, (FunctionFlags_SaveRegisters | FunctionFlags_NoResult), size);
+			CopyMemory(func.sect0, addr, size, MemoryFlags_VirtualProtectSource);
+		}
+
+		if (enable)
+		{
+			WriteJump(addr, func.addr, (size - 5));
+		}
+		else
+		{
+			backupHelper.Restore(addr);
+		}
+	}
+
+	{
+		auto addr     = (appBaseAddr + 0x153A6A);
+		auto jumpAddr = (appBaseAddr + 0x153A73);
+		constexpr size_t size = 9;
+		/*
+		dmc4.exe+153A6A - 66 C7 80 1D1A0000 0000 - mov word ptr [eax+00001A1D],0000
+		dmc4.exe+153A73 - 83 43 04 02            - add dword ptr [ebx+04],02
+		*/
+
+		static Function func = {};
+
+		if (!run)
+		{
+			backupHelper.Save(addr, size);
+			func = CreateFunction(EventCutsceneStart, jumpAddr, (FunctionFlags_SaveRegisters | FunctionFlags_NoResult), size);
+			CopyMemory(func.sect0, addr, size, MemoryFlags_VirtualProtectSource);
+		}
+
+		if (enable)
+		{
+			WriteJump(addr, func.addr, (size - 5));
+		}
+		else
+		{
+			backupHelper.Restore(addr);
+		}
+	}
+
+	// EventCutsceneEnd
+	{
+		auto addr     = (appBaseAddr + 0x153A98);
+		auto jumpAddr = (appBaseAddr + 0x153A9F);
+		constexpr size_t size = 7;
+		/*
+		dmc4.exe+153A98 - C6 80 1D1A0000 01 - mov byte ptr [eax+00001A1D],01
+		dmc4.exe+153A9F - 83 43 04 02       - add dword ptr [ebx+04],02
+		*/
+
+		static Function func = {};
+
+		if (!run)
+		{
+			backupHelper.Save(addr, size);
+			func = CreateFunction(EventCutsceneEnd, jumpAddr, (FunctionFlags_SaveRegisters | FunctionFlags_NoResult), size);
+			CopyMemory(func.sect0, addr, size, MemoryFlags_VirtualProtectSource);
+		}
+
+		if (enable)
+		{
+			WriteJump(addr, func.addr, (size - 5));
+		}
+		else
+		{
+			backupHelper.Restore(addr);
+		}
+	}
+
 
 
 	run = true;

Kyrie/Vars.ixx

@@ -381,7 +381,9 @@ export struct PlayerActorData
 	_(6568);
 	uint32 costume; // 0x19A8
 	uint32 character; // 0x19AC
-	_(336);
+	_(109);
+	bool enable; // 0x1A1D
+	_(226);
 	float hitPoints; // 0x1B00
 	float maxHitPoints; // 0x1B04
 	_(2556);
@@ -391,6 +393,7 @@ export struct PlayerActorData
 
 static_assert(offsetof(PlayerActorData, costume) == 0x19A8);
 static_assert(offsetof(PlayerActorData, character) == 0x19AC);
+static_assert(offsetof(PlayerActorData, enable) == 0x1A1D);
 static_assert(offsetof(PlayerActorData, hitPoints) == 0x1B00);
 static_assert(offsetof(PlayerActorData, maxHitPoints) == 0x1B04);
 static_assert(offsetof(PlayerActorData, magicPoints) == 0x2504);

README.md

@@ -56,7 +56,7 @@ The following is required to undo the latest patch. You only need to do this onc
 
 * Go to the savegame directory. By default this is `C:\Program Files (x86)\Steam\userdata\STEAM_ACCOUNT_ID\631510\remote`.
 
-If you don't know your STEAM_ACCOUNT_ID, here's how to get it without external tools:
+If you don't know your `STEAM_ACCOUNT_ID`, here's how to get it without external tools:
 
 * In Steam hover over your big username and click on `Profile`.
 * Right click somewhere in the middle of the window and left click on `View Source...`.
@@ -65,7 +65,7 @@ If you don't know your STEAM_ACCOUNT_ID, here's how to get it without external t
 
 * In the text editor, press CTRL+F and search for `data-miniprofile=`.
 
-    The number in the quotes, on the right side of the first search result, is your STEAM_ACCOUNT_ID.
+    The number in the quotes, on the right side of the first search result, is your `STEAM_ACCOUNT_ID`.
 
 Copy the following files to a secure and easily accessible location:
 
@@ -77,7 +77,7 @@ Copy the following files to a secure and easily accessible location:
 
 * Go to the savegame directory. By default this is `C:\Users\USER_NAME\Documents\CAPCOM\DEVILMAYCRY4SPECIALEDITION`.
 
-If you don't know your USER_NAME, give your tech-savvy grandchild a call.
+If you don't know your `USER_NAME`, give your tech-savvy grandchild a call.
 
 Copy `SavedGame00.DevilMayCry4SpecialEdition` to a secure and easily accessible location.
 

Scripts/dmc4_create_data.js

@@ -520,6 +520,7 @@ let items =
 [
 	[ "costume"       , "uint32", [], 0x19A8 ],
 	[ "character"     , "uint32", [], 0x19AC ],
+	[ "enable"        , "bool"  , [], 0x1A1D ],
 	[ "hitPoints"     , "float" , [], 0x1B00 ],
 	[ "maxHitPoints"  , "float" , [], 0x1B04 ],
 	[ "magicPoints"   , "float" , [], 0x2504 ],