Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 12 additions & 6 deletions LiveSplit.TheSimpsonsHitAndRun.asl
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ state("Simpsons", "ReleaseEnglish")
int loadingRequestHead : 0x2C8FF4, 0x73A4; // Loading Manager -> mRequestHead. Credit EnAppelsin#6509.
int loadingRequestTail : 0x2C8FF4, 0x73A8; // Loading Manager -> mRequestTail. Credit EnAppelsin#6509.
int isLoading : 0x2C8FF4, 0x73AC; // Loading Manager -> mLoading. Credit EnAppelsin#6509.
int waitingOnFade : 0x2C8980, 0x84; // Presentation Manager -> mWaitingOnFade. Credit Proddy.
}

state("Simpsons", "ReleaseInternational")
Expand All @@ -52,6 +53,7 @@ state("Simpsons", "ReleaseInternational")
int loadingRequestHead : 0x2C8FB4, 0x73A4; // Loading Manager -> mRequestHead. Credit EnAppelsin#6509.
int loadingRequestTail : 0x2C8FB4, 0x73A8; // Loading Manager -> mRequestTail. Credit EnAppelsin#6509.
int isLoading : 0x2C8FB4, 0x73AC; // Loading Manager -> mLoading. Credit EnAppelsin#6509.
int waitingOnFade : 0x2C8940, 0x84; // Presentation Manager -> mWaitingOnFade. Credit Proddy.
}

state("Simpsons", "BestSellersSeries")
Expand All @@ -73,6 +75,7 @@ state("Simpsons", "BestSellersSeries")
int loadingRequestHead : 0x2C8FEC, 0x73A4; // Loading Manager -> mRequestHead. Credit EnAppelsin#6509.
int loadingRequestTail : 0x2C8FEC, 0x73A8; // Loading Manager -> mRequestTail. Credit EnAppelsin#6509.
int isLoading : 0x2C8FEC, 0x73AC; // Loading Manager -> mLoading. Credit EnAppelsin#6509.
int waitingOnFade : 0x2C8978, 0x84; // Presentation Manager -> mWaitingOnFade. Credit Proddy.
}

startup
Expand Down Expand Up @@ -387,13 +390,15 @@ init

// Version checking. Credits Lucas Cardellini
uint ver = current.verCheck;
if (ver == 0xFAE804C5 || ver == 0xC985ED33) // Demo or Release International
version = "ReleaseInternational";
else if (ver == 0x4B8B2274) // Release English
if (ver == 0x4B8B2274) // Release English
version = "ReleaseEnglish";
else if (ver == 0xFC468D05) // Best Sellers Series
else if (ver == 0xC985ED33) // Release International
version = "ReleaseInternational";
else if (ver == 0xFC468D05) // Best Sellers Series
version = "BestSellersSeries";
else // Unknown version
else if (ver == 0xFAE804C5) // Demo
print("Unsupported version: Demo");
else // Unknown version
print("Unknown version: " + ver);

// If the 100% final split is enabled or we need to calculate percentage, all the pointers
Expand Down Expand Up @@ -666,5 +671,6 @@ isLoading
return current.gameState == 8
|| (current.gameState == 10 && current.notLoading == 0 && current.paused == 0 && current.boothScreens == 0)
|| (current.gameState == 2 && current.mainMenu == 0)
|| ((current.interiorState == 1 || current.interiorState == 2) && (current.isLoading == 1 || current.loadingRequestHead != current.loadingRequestTail));
|| ((current.interiorState == 1 || current.interiorState == 2) && (current.isLoading == 1 || current.loadingRequestHead != current.loadingRequestTail))
|| ((current.waitingOnFade & 2) != 0);
}
18 changes: 12 additions & 6 deletions Release/LiveSplit.TheSimpsonsHitAndRun.asl
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ state("Simpsons", "ReleaseEnglish")
int loadingRequestHead : 0x2C8FF4, 0x73A4; // Loading Manager -> mRequestHead. Credit EnAppelsin#6509.
int loadingRequestTail : 0x2C8FF4, 0x73A8; // Loading Manager -> mRequestTail. Credit EnAppelsin#6509.
int isLoading : 0x2C8FF4, 0x73AC; // Loading Manager -> mLoading. Credit EnAppelsin#6509.
int waitingOnFade : 0x2C8980, 0x84; // Presentation Manager -> mWaitingOnFade. Credit Proddy.
}

state("Simpsons", "ReleaseInternational")
Expand All @@ -52,6 +53,7 @@ state("Simpsons", "ReleaseInternational")
int loadingRequestHead : 0x2C8FB4, 0x73A4; // Loading Manager -> mRequestHead. Credit EnAppelsin#6509.
int loadingRequestTail : 0x2C8FB4, 0x73A8; // Loading Manager -> mRequestTail. Credit EnAppelsin#6509.
int isLoading : 0x2C8FB4, 0x73AC; // Loading Manager -> mLoading. Credit EnAppelsin#6509.
int waitingOnFade : 0x2C8940, 0x84; // Presentation Manager -> mWaitingOnFade. Credit Proddy.
}

state("Simpsons", "BestSellersSeries")
Expand All @@ -73,6 +75,7 @@ state("Simpsons", "BestSellersSeries")
int loadingRequestHead : 0x2C8FEC, 0x73A4; // Loading Manager -> mRequestHead. Credit EnAppelsin#6509.
int loadingRequestTail : 0x2C8FEC, 0x73A8; // Loading Manager -> mRequestTail. Credit EnAppelsin#6509.
int isLoading : 0x2C8FEC, 0x73AC; // Loading Manager -> mLoading. Credit EnAppelsin#6509.
int waitingOnFade : 0x2C8978, 0x84; // Presentation Manager -> mWaitingOnFade. Credit Proddy.
}

startup
Expand Down Expand Up @@ -387,13 +390,15 @@ init

// Version checking. Credits Lucas Cardellini
uint ver = current.verCheck;
if (ver == 0xFAE804C5 || ver == 0xC985ED33) // Demo or Release International
version = "ReleaseInternational";
else if (ver == 0x4B8B2274) // Release English
if (ver == 0x4B8B2274) // Release English
version = "ReleaseEnglish";
else if (ver == 0xFC468D05) // Best Sellers Series
else if (ver == 0xC985ED33) // Release International
version = "ReleaseInternational";
else if (ver == 0xFC468D05) // Best Sellers Series
version = "BestSellersSeries";
else // Unknown version
else if (ver == 0xFAE804C5) // Demo
print("Unsupported version: Demo");
else // Unknown version
print("Unknown version: " + ver);

// If the 100% final split is enabled or we need to calculate percentage, all the pointers
Expand Down Expand Up @@ -666,5 +671,6 @@ isLoading
return current.gameState == 8
|| (current.gameState == 10 && current.notLoading == 0 && current.paused == 0 && current.boothScreens == 0)
|| (current.gameState == 2 && current.mainMenu == 0)
|| ((current.interiorState == 1 || current.interiorState == 2) && (current.isLoading == 1 || current.loadingRequestHead != current.loadingRequestTail));
|| ((current.interiorState == 1 || current.interiorState == 2) && (current.isLoading == 1 || current.loadingRequestHead != current.loadingRequestTail))
|| ((current.waitingOnFade & 2) != 0);
}