[Shadow Gens] Always Use Movie Shadow Skin: fix Doom Powers (again)

hedge-dev · Dec 15, 2024 · 7455a4f · 7455a4f
1 parent bf728de
commit 7455a4f
Showing 1 changed file with 22 additions and 11 deletions.
diff --git a/Source/Shadow Generations/Gameplay/Always Use Movie Shadow Skin (experimental).hmm b/Source/Shadow Generations/Gameplay/Always Use Movie Shadow Skin (experimental).hmm
@@ -1,4 +1,4 @@
-Patch "Always Use Movie Shadow Skin (experimental)" in "Gameplay" by "Hyper" does
+Patch "Always Use Movie Shadow Skin (experimental)" in "Gameplay" by "Hyper & angryzor" does
 /*
 Always uses the Movie Shadow skin across the game.
 
@@ -15,21 +15,21 @@ Known issues;
 {
     long[] addrs =
     {
-        /* v1.10.0.0: 0x1406836D9 */ ScanSignature("\xE8\xCC\xCC\xCC\xCC\x44\x0F\xB6\xE0\x3C\x02", "x????xxxxxx"),
-        /* v1.10.0.0: 0x14011785D */ ScanSignature("\xE8\xCC\xCC\xCC\xCC\x88\x85\x40\x01\x00\x00", "x????xxxxxx"),
-        /* v1.10.0.0: 0x1400FF474 */ ScanSignature("\xE8\xCC\xCC\xCC\xCC\x0F\xBE\xD0\x33\xC9", "x????xxxxx"),
-        /* v1.10.0.0: 0x140180D11 */ ScanSignature("\xE8\xCC\xCC\xCC\xCC\x3C\x02\x0F\x85\xBC\x01\x00\x00", "x????xxxxxxxx"),
-        /* v1.10.0.0: 0x140180EE0 */ ScanSignature("\xE8\xCC\xCC\xCC\xCC\x3C\x02\x0F\x85\xFC\x05\x00\x00", "x????xxxxxxxx"),
-        /* v1.10.0.0: 0x14A93E2F3 */ ScanSignature("\xE8\xCC\xCC\xCC\xCC\x31\xDB\x3C\x02\x0F\x85\x80\x00\x00\x00", "x????xxxxxxxxxx"),
-        /* v1.10.0.0: 0x1407EB9AB */ ScanSignature("\xE8\xCC\xCC\xCC\xCC\x84\xC0\x41\x0F\x95\xC7", "x????xxxxxx"),
-        /* v1.10.0.0: 0x14B5ACCE4 */ ScanSignature("\xE8\xCC\xCC\xCC\xCC\x66\x89\x0D\xCC\xCC\xCC\xCC\x3C\x01", "x????xxx????xx"),
-        /* v1.10.0.0: 0x14060DC48 */ ScanSignature("\xE8\xCC\xCC\xCC\xCC\x88\x45\x67\xC6\x45\x77\x01", "x????xxxxxxx")
+        /* v1.10.0.0: 0x1406836D9 */ ScanSignature("\xE8\xCC\xCC\xCC\xCC\x44\x0F\xB6\xE0\x3C\x02", "x????xxxxxx"),                     // Load model resources.
+        /* v1.10.0.0: 0x14011785D */ ScanSignature("\xE8\xCC\xCC\xCC\xCC\x88\x85\x40\x01\x00\x00", "x????xxxxxx"),                     // Load model.
+        /* v1.10.0.0: 0x1400FF474 */ ScanSignature("\xE8\xCC\xCC\xCC\xCC\x0F\xBE\xD0\x33\xC9", "x????xxxxx"),                          // Load model.
+        /* v1.10.0.0: 0x140180D11 */ ScanSignature("\xE8\xCC\xCC\xCC\xCC\x3C\x02\x0F\x85\xBC\x01\x00\x00", "x????xxxxxxxx"),           // Load misc. resources.
+        /* v1.10.0.0: 0x140180EE0 */ ScanSignature("\xE8\xCC\xCC\xCC\xCC\x3C\x02\x0F\x85\xFC\x05\x00\x00", "x????xxxxxxxx"),           // Load voice resources.
+        /* v1.10.0.0: 0x14A93E2F3 */ ScanSignature("\xE8\xCC\xCC\xCC\xCC\x31\xDB\x3C\x02\x0F\x85\x80\x00\x00\x00", "x????xxxxxxxxxx"), // Load effects.
+        /* v1.10.0.0: 0x1407EB9AB */ ScanSignature("\xE8\xCC\xCC\xCC\xCC\x84\xC0\x41\x0F\x95\xC7", "x????xxxxxx"),                     // Load stage select model.
+        /* v1.10.0.0: 0x14B5ACCE4 */ ScanSignature("\xE8\xCC\xCC\xCC\xCC\x66\x89\x0D\xCC\xCC\xCC\xCC\x3C\x01", "x????xxx????xx"),      // Load eye bones.
+        /* v1.10.0.0: 0x14060DC48 */ ScanSignature("\xE8\xCC\xCC\xCC\xCC\x88\x45\x67\xC6\x45\x77\x01", "x????xxxxxxx")                 // Load info.
     };
 
     foreach (var addr in addrs)
         WriteProtected<byte>(addr, Assemble("mov al, 2; nop; nop; nop"));
 
-    // Force load Movie Shadow resources.
+    // Force load Movie Shadow UI and sound resources.
     WriteNop
     (
         /* v1.10.0.0: 0x1401806D0 */
@@ -52,4 +52,15 @@ Known issues;
             "xxxxxxxxxxx"
         )
     );
+
+    // Disable Movie Shadow Doom Power restrictions (angryzor).
+    Memory.WriteForceJump
+    (
+        /* v1.10.0.0: 0x14060E211 */
+        ScanSignature
+        (
+            "\x75\x55\x45\x33\xC0",
+            "xxxxx"
+        )
+    );
 }