RE 2, room 301, fix random event crash

biorand · Dec 8, 2023 · 90d9408 · 90d9408
1 parent 8ba57fd
commit 90d9408
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/IntelOrca.Biohazard.BioRand/Rdt.cs b/IntelOrca.Biohazard.BioRand/Rdt.cs
@@ -413,7 +413,10 @@ public void AddCustomScript()
             if (insertIndex == -1)
                 throw new Exception("Unable to insert custom script");
 
-            insertIndex = FindNextLine(disassembly, insertIndex);
+            var nextProc = disassembly.IndexOf(".proc", insertIndex + 1);
+            var endOfFirstProc = disassembly.LastIndexOf("evt_end", nextProc);
+
+            insertIndex = FindStartOfLine(disassembly, endOfFirstProc);
             disassembly = disassembly.Insert(insertIndex, "    gosub                   biorand_custom\n");
 
             var scdAssembler = new ScdAssembler();
@@ -430,6 +433,16 @@ public void AddCustomScript()
             RdtFile = RdtFile.WithScd(BioScriptKind.Main, newScd);
         }
 
+        private static int FindStartOfLine(string s, int startIndex)
+        {
+            var index = startIndex;
+            while (index < s.Length && s[index] != '\n' && s[index] != '\r')
+            {
+                index--;
+            }
+            return index + 1;
+        }
+
         private static int FindNextLine(string s, int startIndex)
         {
             var index = startIndex;