Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Workaround for Chapter 1 splitting right after starting #88

Merged
merged 4 commits into from
Nov 30, 2024
Merged

Workaround for Chapter 1 splitting right after starting #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ec5710
Workaround for Chapter 1 splitting right after starting
ners-xd Nov 30, 2024
1c7958c
More specific comment
ners-xd Nov 30, 2024
f68eedf
Update cspell.json
ners-xd Nov 30, 2024
2f1de7a
Better 64-bit room sigscan (from Neesi's LOVE autosplitters)
ners-xd Nov 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Deltarune.asl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down Expand Up @@ -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<string>)(() =>
{
Expand Down Expand Up @@ -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
}
}

Expand Down
1 change: 1 addition & 0 deletions cspell.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
"Mauswheel",
"Meca",
"monsterhp",
"mystring",
"Narry",
"NERS",
"Pipis",
Expand Down