From 20a394023ed5e128e6fbf421dbebae1beeeb6762 Mon Sep 17 00:00:00 2001 From: NERS1111 <85985080+NERS1111@users.noreply.github.com> Date: Sat, 22 Jun 2024 11:36:59 +0300 Subject: [PATCH 1/2] Unnecessary comment --- Deltarune.asl | 1 - 1 file changed, 1 deletion(-) diff --git a/Deltarune.asl b/Deltarune.asl index f4369ca..0dc794d 100644 --- a/Deltarune.asl +++ b/Deltarune.asl @@ -19,7 +19,6 @@ state("DELTARUNE", "SURVEY_PROGRAM") state("DELTARUNE", "Demo v1.08 / v1.09") { - // Global double chapter : 0x6FCF38, 0x30, 0x24D8, 0x0; // global.chapter double fight : 0x6FCF38, 0x30, 0x4F8, 0x0; // global.fighting From 6557d6cb82076cbd25a54f13936b2ed0211deff4 Mon Sep 17 00:00:00 2001 From: NERS <85985080+ners-xd@users.noreply.github.com> Date: Wed, 25 Sep 2024 20:15:39 +0300 Subject: [PATCH 2/2] "Insert Loaded Disk" split for Trinky44 --- Deltarune.asl | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Deltarune.asl b/Deltarune.asl index 0dc794d..a9c0148 100644 --- a/Deltarune.asl +++ b/Deltarune.asl @@ -184,6 +184,7 @@ startup settings.Add("Ch2_AB", false, "All Bosses Splits"); settings.CurrentDefaultParent = "Ch2_AB"; settings.Add("Ch2_Disk_Loaded", false, "Obtain Loaded Disk"); + settings.Add("Ch2_Disk_Inserted", false, "Insert Loaded Disk"); settings.Add("Ch2_SpamtonNEO_End", false, "End basement Spamton NEO battle"); settings.SetToolTip("Ch2_SpamtonNEO_End", @"This autosplit does not work if you remove Spamton NEO's battle theme from the game files (mus\spamton_neo_mix_ex_wip.ogg)."); settings.Add("Ch2_SpamtonNEO_Leave", false, "Exit basement Spamton NEO room"); @@ -324,15 +325,16 @@ init {"Ch2_TasqueManager", new object[] {false, "room_dw_mansion_tasquePaintings_ch2", "room_dw_mansion_traffic_ch2", -1, -1, 0}}, {"Ch2_Mauswheel", new object[] {false, "room_dw_mansion_kitchen_ch2", "room_dw_mansion_east_2f_transformed_new_ch2", -1, -1, 0}}, {"Ch2_Disk_Loaded", new object[] {false, null, "room_shop_ch2_spamton_ch2", -1, -1, 10}}, - {"Ch2_SpamtonNEO_End", new object[] {false, null, "room_dw_mansion_b_east_ch2", -1, -1, 11}}, + {"Ch2_Disk_Inserted", new object[] {false, null, "room_dw_mansion_b_east_b_ch2", -1, -1, 11}}, + {"Ch2_SpamtonNEO_End", new object[] {false, null, "room_dw_mansion_b_east_ch2", -1, -1, 12}}, {"Ch2_SpamtonNEO_Leave", new object[] {false, "room_dw_mansion_b_east_ch2", "room_dw_mansion_b_east_a_ch2", -1, -1, 0}}, {"Ch2_AcidLake_Enter", new object[] {false, "room_dw_mansion_east_3f_ch2", "room_dw_mansion_acid_tunnel_ch2", -1, -1, 0}}, {"Ch2_AcidLake_Exit", new object[] {false, "room_dw_mansion_acid_tunnel_loop_rouxls_ch2", "room_dw_mansion_acid_tunnel_exit_ch2", -1, -1, 0}}, {"Ch2_Queen", new object[] {false, "room_dw_mansion_east_4f_d_ch2", "room_dw_mansion_top_ch2", -1, -1, 0}}, {"Ch2_GigaQueen", new object[] {false, "room_dw_mansion_top_ch2", "room_dw_mansion_top_post_ch2", -1, -1, 0}}, - {"Ch2_Fountain_Enter", new object[] {false, null, null, -1, -1, 12}}, + {"Ch2_Fountain_Enter", new object[] {false, null, null, -1, -1, 13}}, {"Ch2_SGSpamtonNEO_End", new object[] {false, null, "room_dw_mansion_fountain_ch2", 1, 0, 0}}, - {"Ch2_Fountain_Exit", new object[] {false, null, "room_lw_computer_lab_ch2", -1, -1, 13}} + {"Ch2_Fountain_Exit", new object[] {false, null, "room_lw_computer_lab_ch2", -1, -1, 14}} }; if(version != "SURVEY_PROGRAM" && timer.CurrentPhase == TimerPhase.NotRunning && timer.CurrentTimingMethod == TimingMethod.RealTime && (settings["AC_PauseTimer"] || settings["AC_PauseTimerOST"])) @@ -546,15 +548,19 @@ split pass = (old.loadedDiskGreyBG <= 121 && current.loadedDiskGreyBG == 121); break; - case 11: // Ch2_SpamtonNEO_End + case 11: // Ch2_Disk_Inserted + pass = ((old.text == @"＊ (なにも起こらなかった)/%" || old.text == @"* (Nothing happened.)/%") && current.text == null); + break; + + case 12: // Ch2_SpamtonNEO_End pass = (old.song.EndsWith(@"mus\spamton_neo_mix_ex_wip.ogg") && current.song == null); break; - case 12: // Ch2_Fountain_Enter + case 13: // Ch2_Fountain_Enter pass = (current.roomName == "room_cc_fountain_ch2" || current.roomName == "room_dw_mansion_fountain_ch2"); break; - case 13: // Ch2_Fountain_Exit + case 14: // Ch2_Fountain_Exit pass = (old.roomName == "room_cc_fountain_ch2" || old.roomName == "room_dw_mansion_fountain_ch2"); break; }