Add cutscene movement and other fixes

644 · Nov 1, 2021 · af84d58 · af84d58
1 parent bcf7bd6
commit af84d58
Show file tree

Hide file tree

Showing 16 changed files with 332 additions and 925 deletions.
diff --git a/CheckUpdates.cs b/CheckUpdates.cs
@@ -31,7 +31,7 @@ private async void CheckUpdates_Load(object sender, EventArgs e)
             {
                 await CheckGitHubNewerVersion();
             }
-            catch (Exception err)
+            catch
             {
                 label1.Text = "Could not check for updates";
             }

diff --git a/Config/config.default.json b/Config/config.default.json
@@ -258,6 +258,7 @@
 	},
 	"TrackRemapping": {},
 	"Shuffle": false,
+	"CutsceneMovement": false,
 	"ShuffleRotation": [
 		"Battle_00",
 		"Battle_0a",

diff --git a/Config/config.json b/Config/config.json
@@ -258,6 +258,7 @@
 	},
 	"TrackRemapping": {},
 	"Shuffle": false,
+	"CutsceneMovement": false,
 	"ShuffleRotation": [
 		"Battle_00",
 		"Battle_0a",

diff --git a/DMC3MusicConfig.cs b/DMC3MusicConfig.cs
@@ -12,6 +12,7 @@ public class DMC3MusicConfig
         public Dictionary<string, List<string>> RoomTracks { get; set; }
         public Dictionary<string, List<string>> AmbientTracks { get; set; }
         public bool Shuffle { get; set; }
+        public bool CutsceneMovement { get; set; }
         public List<string> ShuffleRotation { get; set; }
         public int BattleTimer { get; set; }
         public int AmbientTimer { get; set; }

diff --git a/DMC3Process.cs b/DMC3Process.cs
@@ -1,11 +1,7 @@
 using Microsoft.Win32.SafeHandles;
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace dmc3music
 {
@@ -61,7 +57,7 @@ public bool OpenReadOnly()
             Process = localProcess[0];
             Handle = OpenProcess(ProcessAccessFlags.VMRead, false, Process.Id);
 
-            if(Handle == UIntPtr.Zero)
+            if (Handle == UIntPtr.Zero)
             {
                 return false;
             }
@@ -135,7 +131,8 @@ public void WriteInt(int intVal, int address)
 
         public void WriteExactMem(byte[] bytes, int address)
         {
-            WriteProcessMemory(Handle, new IntPtr(address), bytes, (uint)bytes.LongLength, out _);
+            WriteProcessMemory(Handle, new IntPtr(address), bytes, (uint)bytes.LongLength, out int bytesWritten);
+            Console.WriteLine(bytesWritten);
         }
 
         public int ReadExactMem(int address)

diff --git a/Form1.Designer.cs b/Form1.Designer.cs
-Original file line number
+Diff line change
@@ Expand Up @@
                 {
                     await CheckGitHubNewerVersion();
                 }
-                catch (Exception err)
+                catch
                 {
                     label1.Text = "Could not check for updates";
                 }
@@ Expand Down @@