From 5c8e02f413c6015c6aaf5b30ca429049164890db Mon Sep 17 00:00:00 2001 From: NERS1111 <85985080+NERS1111@users.noreply.github.com> Date: Sun, 18 Feb 2024 11:08:18 +0200 Subject: [PATCH 1/8] Random space --- Deltarune.asl | 1 - 1 file changed, 1 deletion(-) diff --git a/Deltarune.asl b/Deltarune.asl index e19745c..a89b263 100644 --- a/Deltarune.asl +++ b/Deltarune.asl @@ -51,7 +51,6 @@ state("DELTARUNE", "Demo v1.10") string32 sound : 0x4E0794, 0x58, 0xC0, 0x40, 0x0; string128 text : 0x6FCE4C, 0x8, 0x144, 0x24, 0x10, 0x5A0, 0x0, 0x0, 0x0; string256 song : 0x4DFF58, 0x0, 0x44, 0x0; - } state("DELTARUNE", "Demo Steam Beta") From 8022bfe1948bd79df0b41b75d002064c3e85601f Mon Sep 17 00:00:00 2001 From: NERS1111 <85985080+NERS1111@users.noreply.github.com> Date: Sat, 9 Mar 2024 13:09:36 +0200 Subject: [PATCH 2/8] Tiny rearrangement --- Deltarune.asl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Deltarune.asl b/Deltarune.asl index a89b263..fb288aa 100644 --- a/Deltarune.asl +++ b/Deltarune.asl @@ -17,8 +17,8 @@ state("DELTARUNE", "SURVEY_PROGRAM") state("DELTARUNE", "Demo v1.08 / v1.09") { - double fight : 0x6FCF38, 0x30, 0x4F8, 0x0; // global.fighting double chapter : 0x6FCF38, 0x30, 0x24D8, 0x0; // global.chapter + double fight : 0x6FCF38, 0x30, 0x4F8, 0x0; // global.fighting double lancerCon : 0x6EF220, 0x128, 0x510, 0x20, 0x24, 0x10, 0xD8, 0x0; double doorCloseCon : 0x6EF220, 0x84, 0x24, 0x10, 0x18, 0x0; @@ -36,8 +36,8 @@ state("DELTARUNE", "Demo v1.08 / v1.09") state("DELTARUNE", "Demo v1.10") { - double fight : 0x6FCF38, 0x30, 0x4F8, 0x0; double chapter : 0x6FCF38, 0x30, 0x24D8, 0x0; + double fight : 0x6FCF38, 0x30, 0x4F8, 0x0; double lancerCon : 0x6EF220, 0x128, 0x510, 0x20, 0x24, 0x10, 0xD8, 0x0; double doorCloseCon : 0x6EF220, 0x84, 0x24, 0x10, 0x18, 0x0; @@ -55,8 +55,8 @@ state("DELTARUNE", "Demo v1.10") state("DELTARUNE", "Demo Steam Beta") { - double fight : 0x6FE860, 0x30, 0xA758, 0x0; double chapter : 0x6FE860, 0x30, 0x2F34, 0x80; + double fight : 0x6FE860, 0x30, 0xA758, 0x0; double lancerCon : 0x6F0B48, 0x128, 0x510, 0x20, 0x24, 0x10, 0x138, 0x0; double doorCloseCon : 0x6F0B48, 0x84, 0x24, 0x10, 0x18, 0x0; From b9198b682ac8362e7d9d759278223070c1389bb5 Mon Sep 17 00:00:00 2001 From: NERS1111 <85985080+NERS1111@users.noreply.github.com> Date: Sat, 9 Mar 2024 13:11:34 +0200 Subject: [PATCH 3/8] Extra check --- Deltarune.asl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Deltarune.asl b/Deltarune.asl index fb288aa..1e26657 100644 --- a/Deltarune.asl +++ b/Deltarune.asl @@ -464,7 +464,8 @@ reset onReset { vars.resetVars(); - vars.resetSplits(); + if(game != null) + vars.resetSplits(); } split From 66d9c3bcde87c855d845bbb808a0c098c5097b7a Mon Sep 17 00:00:00 2001 From: NERS1111 <85985080+NERS1111@users.noreply.github.com> Date: Sat, 9 Mar 2024 23:43:12 +0200 Subject: [PATCH 4/8] Mistake --- Deltarune.asl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Deltarune.asl b/Deltarune.asl index 1e26657..c27edcd 100644 --- a/Deltarune.asl +++ b/Deltarune.asl @@ -215,7 +215,7 @@ init Func scan = (o, sig) => { IntPtr ptr = vars.x64 // It's possible that the game may be on the new 64-bit only GameMaker runtime in the future, so I added this just in case - ? scanner.Scan(new SigScanTarget(o, sig) { OnFound = (p, s, addr) => p.ReadPointer(addr + p.ReadValue(addr) + 0x4) }) + ? scanner.Scan(new SigScanTarget(o, sig) { OnFound = (p, s, addr) => addr + p.ReadValue(addr) + 0x4 }) : scanner.Scan(new SigScanTarget(o, sig) { OnFound = (p, s, addr) => p.ReadPointer(addr) }); if(ptr == IntPtr.Zero) throw new NullReferenceException("[DELTARUNE] Signature scanning failed"); From 4190e55a5138372f76e3101910b048e7775bf99c Mon Sep 17 00:00:00 2001 From: NERS1111 <85985080+NERS1111@users.noreply.github.com> Date: Tue, 12 Mar 2024 12:18:22 +0200 Subject: [PATCH 5/8] Made all the splits off by default --- Deltarune.asl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Deltarune.asl b/Deltarune.asl index c27edcd..9a2f1a6 100644 --- a/Deltarune.asl +++ b/Deltarune.asl @@ -123,7 +123,7 @@ startup settings.Add("AC_Continue", false, "Split on starting a chapter from a previous save file"); settings.CurrentDefaultParent = null; // ------------------------------------------------------------------------------------------- - settings.Add("Ch1", true, "Chapter 1: The Beginning"); + settings.Add("Ch1", false, "Chapter 1: The Beginning"); settings.CurrentDefaultParent = "Ch1"; settings.Add("Ch1_School", false, "Enter Dark World (True Reset)"); @@ -142,7 +142,7 @@ startup settings.Add("Ch1_King_Exit", false, "Exit King room"); settings.Add("Ch1_Fountain_Enter", false, "Enter Fountain"); settings.Add("Ch1_Fountain_Exit", false, "Exit Fountain"); - settings.Add("Ch1_Ending", true, "Ending"); + settings.Add("Ch1_Ending", false, "Ending"); settings.Add("Ch1_EndingOST", false, "(OST%) Ending"); settings.Add("Ch1_AB", false, "All Bosses Splits"); @@ -153,7 +153,7 @@ startup settings.Add("Ch1_Jevil_LeaveRoom", false, "Exit Jevil room"); settings.CurrentDefaultParent = null; // ------------------------------------------------------------------------------------------- - settings.Add("Ch2", true, "Chapter 2: A Cyber's World"); + settings.Add("Ch2", false, "Chapter 2: A Cyber's World"); settings.CurrentDefaultParent = "Ch2"; settings.Add("Ch2_Library", false, "Enter Dark World (True Reset)"); @@ -179,7 +179,7 @@ startup settings.Add("Ch2_GigaQueen", false, "End Giga Queen battle"); settings.Add("Ch2_Fountain_Enter", false, "Enter Fountain"); settings.Add("Ch2_Fountain_Exit", false, "Exit Fountain"); - settings.Add("Ch2_Ending", true, "Ending"); + settings.Add("Ch2_Ending", false, "Ending"); settings.Add("Ch2_EndingOST", false, "(OST%) Ending"); settings.Add("Ch2_AB", false, "All Bosses Splits"); From 0e7d6fdd0c8af03911524900431242b2d56a74af Mon Sep 17 00:00:00 2001 From: NERS1111 <85985080+NERS1111@users.noreply.github.com> Date: Tue, 12 Mar 2024 12:19:10 +0200 Subject: [PATCH 6/8] Comments --- Deltarune.asl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Deltarune.asl b/Deltarune.asl index 9a2f1a6..6e2dce8 100644 --- a/Deltarune.asl +++ b/Deltarune.asl @@ -2,9 +2,11 @@ state("DELTARUNE", "SURVEY_PROGRAM") { + // Global double plot : 0x48E5DC, 0x27C, 0x488, 0x500; // global.plot double choicer : 0x48E5DC, 0x27C, 0x28, 0x40; // global.choice + // Self double lancerCon : 0x48BDEC, 0x10, 0x60, 0x10, 0x10, 0x0; // obj_darkcastle_event.con double doorCloseCon : 0x48BDEC, 0xC, 0x60, 0x10, 0x10, 0x0; // obj_darkdoorevent.con double jevilDance : 0x48BDEC, 0x78, 0x60, 0x10, 0x10, 0x0; // obj_joker_body.dancelv From 0aab7ef6047d86995ea0b98e45afb893a81a5b6c Mon Sep 17 00:00:00 2001 From: NERS1111 <85985080+NERS1111@users.noreply.github.com> Date: Sun, 17 Mar 2024 12:02:40 +0200 Subject: [PATCH 7/8] Comments --- Deltarune.asl | 1 + 1 file changed, 1 insertion(+) diff --git a/Deltarune.asl b/Deltarune.asl index 6e2dce8..3b07191 100644 --- a/Deltarune.asl +++ b/Deltarune.asl @@ -199,6 +199,7 @@ startup settings.Add("Ch2_SGBerdly_LeaveRoom", false, "Exit Berdly 2 room (Weird Route)"); settings.Add("Ch2_SGSpamtonNEO_End", false, "End fountain Spamton NEO battle"); settings.CurrentDefaultParent = null; + // ------------------------------------------------------------------------------------------- } exit From eb9c01c20f632a38d251bead2860e7fd829c99d2 Mon Sep 17 00:00:00 2001 From: NERS1111 <85985080+NERS1111@users.noreply.github.com> Date: Thu, 21 Mar 2024 10:00:19 +0200 Subject: [PATCH 8/8] freezeRingTimer pointer change --- Deltarune.asl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Deltarune.asl b/Deltarune.asl index 3b07191..9d6f978 100644 --- a/Deltarune.asl +++ b/Deltarune.asl @@ -26,7 +26,7 @@ state("DELTARUNE", "Demo v1.08 / v1.09") double doorCloseCon : 0x6EF220, 0x84, 0x24, 0x10, 0x18, 0x0; double namerEvent : 0x6EF220, 0xD4, 0x5C, 0x20, 0x24, 0x10, 0x9C, 0x0; // DEVICE_NAMER.EVENT double loadedDiskGreyBG : 0x6EF220, 0x84, 0x24, 0x10, 0x3D8, 0x0; // obj_shop_ch2_spamton.greybgtimer - double freezeRingTimer : 0x6EF220, 0x128, 0xF0, 0x20, 0x24, 0x10, 0xC0, 0x0; // obj_weirdEvent_addison_city_big_2.timer + double freezeRingTimer : 0x6EF220, 0x128, 0x24, 0xA0, 0x24, 0x10, 0xC0, 0x0; // obj_weirdEvent_addison_city_big_2.timer double snowgrave : 0x6EF220, 0xF4, 0x27C, 0x6C, 0x5C, 0x20, 0x144, 0x24, 0x10, 0xC0, 0x0; // obj_spell_snowgrave.timer float kingPos : 0x6F1394, 0x4, 0x140, 0x68, 0x3C, 0x8, 0xB0; @@ -45,7 +45,7 @@ state("DELTARUNE", "Demo v1.10") double doorCloseCon : 0x6EF220, 0x84, 0x24, 0x10, 0x18, 0x0; double namerEvent : 0x6EF220, 0xD4, 0x5C, 0x20, 0x24, 0x10, 0x2F4, 0x0; double loadedDiskGreyBG : 0x6EF220, 0x84, 0x24, 0x10, 0x87C, 0x0; - double freezeRingTimer : 0x6EF220, 0x128, 0xF0, 0x20, 0x24, 0x10, 0xC0, 0x0; + double freezeRingTimer : 0x6EF220, 0x128, 0x24, 0xA0, 0x24, 0x10, 0xC0, 0x0; double snowgrave : 0x6EF220, 0xF4, 0x27C, 0x6C, 0x5C, 0x20, 0x144, 0x24, 0x10, 0xC0, 0x0; float kingPos : 0x6F1394, 0x4, 0x140, 0x68, 0x3C, 0x8, 0xB0; @@ -64,7 +64,7 @@ state("DELTARUNE", "Demo Steam Beta") double doorCloseCon : 0x6F0B48, 0x84, 0x24, 0x10, 0x18, 0x0; double namerEvent : 0x6F0B48, 0xD4, 0x5C, 0x20, 0x24, 0x10, 0xFC, 0x0; double loadedDiskGreyBG : 0x6F0B48, 0x84, 0x24, 0x10, 0x0, 0x0; - double freezeRingTimer : 0x6F0B48, 0x128, 0xF0, 0x20, 0x24, 0x10, 0x120, 0x0; + double freezeRingTimer : 0x6F0B48, 0x128, 0x24, 0xA0, 0x24, 0x10, 0x120, 0x0; double snowgrave : 0x6F0B48, 0xF4, 0x27C, 0x6C, 0x5C, 0x20, 0x144, 0x24, 0x10, 0x120, 0x0; float kingPos : 0x6F2CBC, 0x4, 0x140, 0x68, 0x3C, 0x8, 0xB0;