Merge pull request #3 from upstream

Downstream updating

Author: Omnises

FFXCutsceneRemover/Components/MemoryWatchers.cs

@@ -1,10 +1,10 @@
-using System;
-using System.Diagnostics;
-using System.Reflection;
-
-using FFXCutsceneRemover.ComponentUtil;
+using FFXCutsceneRemover.ComponentUtil;
 using FFXCutsceneRemover.Logging;
 using FFXCutsceneRemover.Resources;
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Reflection;
 
 namespace FFXCutsceneRemover;
 
@@ -14,6 +14,7 @@ public static class MemoryWatchers
     private const string MODULE = "FFX.exe";
 
     private static int processBaseAddress;
+    private static int getBaseAddressMaxAttempts = 1000;
 
     public static Process Process;
     public static MemoryWatcherList Watchers = new MemoryWatcherList();
@@ -42,7 +43,7 @@ public static class MemoryWatchers
     public static MemoryWatcher<byte> MovementLock;
     public static MemoryWatcher<byte> ActiveMusicId;
     public static MemoryWatcher<byte> MusicId;
-    public static MemoryWatcher<byte> RoomNumberAlt;
+    public static MemoryWatcher<short> RoomNumberAlt;
     public static MemoryWatcher<short> CutsceneAlt;
     public static MemoryWatcher<short> AirshipDestinations;
     public static MemoryWatcher<byte> AuronOverdrives;
@@ -312,7 +313,21 @@ public static class MemoryWatchers
     public static void Initialize(Process process)
     {
         Process = process;
-        processBaseAddress = process.Modules[0].BaseAddress.ToInt32();
+        processBaseAddress = -1;
+
+        for (int i = 0; i < getBaseAddressMaxAttempts;  i++)
+        {
+            try
+            {
+                processBaseAddress = process.Modules[0].BaseAddress.ToInt32();
+                break;
+            }
+            catch (Win32Exception e)
+            {
+                DiagnosticLog.Information("Exception: " + e.Message);
+            }
+        }
+
         DiagnosticLog.Information($"Process base address: {processBaseAddress:X8}");
 
         Language = GetMemoryWatcher<byte>(MemoryLocations.Language);
@@ -339,7 +354,7 @@ public static void Initialize(Process process)
         MovementLock = GetMemoryWatcher<byte>(MemoryLocations.MovementLock);
         ActiveMusicId = GetMemoryWatcher<byte>(MemoryLocations.ActiveMusicId);
         MusicId = GetMemoryWatcher<byte>(MemoryLocations.MusicId);
-        RoomNumberAlt = GetMemoryWatcher<byte>(MemoryLocations.RoomNumberAlt);
+        RoomNumberAlt = GetMemoryWatcher<short>(MemoryLocations.RoomNumberAlt);
         CutsceneAlt = GetMemoryWatcher<short>(MemoryLocations.CutsceneAlt);
         AirshipDestinations = GetMemoryWatcher<short>(MemoryLocations.AirshipDestinations);
         AuronOverdrives = GetMemoryWatcher<byte>(MemoryLocations.AuronOverdrives);

FFXCutsceneRemover/FFXSpeedrunMod.csproj

@@ -9,7 +9,7 @@
 
 	<!-- ADDITIONAL PROPERTIES -->
 	<PropertyGroup>
-		<Version>1.7.0</Version>
+		<Version>1.7.2</Version>
 		<RepositoryUrl>https://github.com/erickt420/FFXCutsceneRemover</RepositoryUrl>
 	</PropertyGroup>
 

FFXCutsceneRemover/Program.cs

@@ -339,7 +339,7 @@ public class Program
     // Cutscene Remover Version Number, 0x30 - 0x39 = 0 - 9, 0x48 = decimal point
     private const int majorID = 1;
     private const int minorID = 7;
-    private const int patchID = 0;
+    private const int patchID = 2;
     private static List<(string, byte)> startGameText;
 
     static Mutex mutex = new Mutex(true, "CSR");
@@ -472,7 +472,7 @@ private static void MainLoop(CsrConfig config)
                     /*if (csrConfig.SetSeedOn)
                     {
                         DiagnosticLog.Information($"Injecting Seed {seedSubmitted}");
-                        new Transition { ForceLoad = false, SetSeed = true, SetSeedValue = unchecked((int)seedSubmitted), RoomNumberAlt = (short)Array.IndexOf(PCSeeds, seedSubmitted) }.Execute();
+                        new Transition { ForceLoad = false, SetSeed = true, SetSeedValue = unchecked((int)seedSubmitted), RoomNumberAlt = (short)(Array.IndexOf(PCSeeds, seedSubmitted) + 1) }.Execute();
                         seedInjected = true;
                     }*/