From 7ec57100aa224da8d8b568db5391303531047304 Mon Sep 17 00:00:00 2001 From: NERS <85985080+ners-xd@users.noreply.github.com> Date: Sat, 30 Nov 2024 08:49:23 +0200 Subject: [PATCH 1/4] Workaround for Chapter 1 splitting right after starting --- Deltarune.asl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Deltarune.asl b/Deltarune.asl index 00df8c7..8e8d0b1 100644 --- a/Deltarune.asl +++ b/Deltarune.asl @@ -467,7 +467,7 @@ update print("[DELTARUNE] All Chapters: Chapter " + ch + " started, timer resumed"); timer.IsGameTimePaused = false; } - vars.forceSplit = settings["AC_Continue"]; + vars.forceSplit = (settings["AC_Continue"] && timer.CurrentTime.RealTime > TimeSpan.FromSeconds(0)); // Workaround for Chapter 1 splitting right after starting } } From 1c7958cda5baa13e8bc65f5bd5103a5d8868d10a Mon Sep 17 00:00:00 2001 From: NERS <85985080+ners-xd@users.noreply.github.com> Date: Sat, 30 Nov 2024 16:19:00 +0200 Subject: [PATCH 2/4] More specific comment --- Deltarune.asl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Deltarune.asl b/Deltarune.asl index 8e8d0b1..f0f65fb 100644 --- a/Deltarune.asl +++ b/Deltarune.asl @@ -29,7 +29,7 @@ state("DELTARUNE", "Demo v1.08/v1.09") float kingPos : 0x6F1394, 0x4, 0x140, 0x68, 0x3C, 0x8, 0xB0; string32 sound : 0x4E0794, 0x58, 0xC0, 0x40, 0x0; // Full path to the current sound (highest priority) - string128 text : 0x6FCE4C, 0x8, 0x144, 0x24, 0x10, 0x5A0, 0x0, 0x0, 0x0; // Current textbox text, formatting included + string128 text : 0x6FCE4C, 0x8, 0x144, 0x24, 0x10, 0x5A0, 0x0, 0x0, 0x0; // obj_writer.mystring string256 song : 0x4DFF58, 0x0, 0x44, 0x0; // Full path to the current song } From f68eedf8dcb5d9455bd7b0f7d7f3fbc385f9a957 Mon Sep 17 00:00:00 2001 From: NERS <85985080+ners-xd@users.noreply.github.com> Date: Sat, 30 Nov 2024 17:25:24 +0200 Subject: [PATCH 3/4] Update cspell.json --- cspell.json | 1 + 1 file changed, 1 insertion(+) diff --git a/cspell.json b/cspell.json index 3d931ca..04d732f 100644 --- a/cspell.json +++ b/cspell.json @@ -53,6 +53,7 @@ "Mauswheel", "Meca", "monsterhp", + "mystring", "Narry", "NERS", "Pipis", From 2f1de7a2277867bbbf9ab473c18141483ed47ec8 Mon Sep 17 00:00:00 2001 From: NERS <85985080+ners-xd@users.noreply.github.com> Date: Sat, 30 Nov 2024 17:27:54 +0200 Subject: [PATCH 4/4] Better 64-bit room sigscan (from Neesi's LOVE autosplitters) --- Deltarune.asl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Deltarune.asl b/Deltarune.asl index f0f65fb..935ad29 100644 --- a/Deltarune.asl +++ b/Deltarune.asl @@ -252,8 +252,8 @@ init : scan(2, "8B 3D ?? ?? ?? ?? 2B EF"); vars.ptrRoomID = vars.x64 - ? scan(12, "E8 ?? ?? ?? ?? E8 ?? ?? ?? ?? 89 3D ?? ?? ?? ??") - : scan(2, "FF 35 ?? ?? ?? ?? E8 ?? ?? ?? ?? 83 C4 04 50 68"); + ? scan(6, "48 ?? ?? ?? 3B 35 ?? ?? ?? ?? 41 ?? ?? ?? 49 ?? ?? E8 ?? ?? ?? ?? FF") + : scan(2, "FF 35 ?? ?? ?? ?? E8 ?? ?? ?? ?? 83 C4 04 50 68"); vars.getRoomName = (Func)(() => {