Skip to content

Fixed bug with tracking (post-force) Final Form on Isla de Muerta Map popup #86

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

Open
Coraccio wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Fixed bug with tracking (post-force) Final Form on Isla de Muerta Map popup #86

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5748884
Fixed bug with tracking (post-force) Final Form on Isla de Muerta Map…
Coraccio Dec 29, 2021
8ea2631
Added tracking post-force Final Form on Statsanity Bonus slots
Coraccio Mar 28, 2022
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
159 changes: 122 additions & 37 deletions KhTracker/AutoTracking/CheckEveryCheck.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,42 +386,127 @@ public CheckEveryCheck(MemoryReader mem, int offset, int saveAnchor, int sysAnch
checksList.Add(new Check(this, Sys3 + 0x152EE, Save + 0x23DF, 2)); // Garden of Assemblage
checksList.Add(new Check(this, Sys3 + 0x152FA, Save + 0x23DF, 3)); // Garden of Assemblage

// Bonus (35)
checksList.Add(new Check(this, Btl0 + 0x2A9D8, Save + 0x3704, 2)); // Thresholder
checksList.Add(new Check(this, Btl0 + 0x2AA08, Save + 0x3704, 3)); // Dark Thorn
checksList.Add(new Check(this, Btl0 + 0x2AA48, Save + 0x3704, 4)); // Xaldin
checksList.Add(new Check(this, Btl0 + 0x2AA88, Save + 0x3704, 5)); // Cerberus
checksList.Add(new Check(this, Btl0 + 0x2AAA8, Save + 0x3704, 6)); // Pete I
checksList.Add(new Check(this, Btl0 + 0x2AAD8, Save + 0x3704, 7)); // Hydra
checksList.Add(new Check(this, Btl0 + 0x2AB08, Save + 0x3705, 0)); // Hades
checksList.Add(new Check(this, Btl0 + 0x2AB48, Save + 0x3705, 1)); // Shan Yu
checksList.Add(new Check(this, Btl0 + 0x2AB88, Save + 0x3705, 2)); // Storm Rider
checksList.Add(new Check(this, Btl0 + 0x2ABF8, Save + 0x3705, 7)); // Genie Jafar
checksList.Add(new Check(this, Btl0 + 0x2AC08, Save + 0x3706, 0)); // Boat Pete
checksList.Add(new Check(this, Btl0 + 0x2AC38, Save + 0x3706, 1)); // Pete II
checksList.Add(new Check(this, Btl0 + 0x2AC68, Save + 0x3706, 2)); // Prison Keeper
checksList.Add(new Check(this, Btl0 + 0x2AD28, Save + 0x3706, 5)); // Barbossa
checksList.Add(new Check(this, Btl0 + 0x2AD68, Save + 0x3706, 6)); // Grim Reaper II
checksList.Add(new Check(this, Btl0 + 0x2ADD8, Save + 0x3707, 0)); // Luxord
checksList.Add(new Check(this, Btl0 + 0x2AE28, Save + 0x3707, 4)); // Demyx II
checksList.Add(new Check(this, Btl0 + 0x2AE98, Save + 0x3707, 6)); // Groundshaker
checksList.Add(new Check(this, Btl0 + 0x2AEB8, Save + 0x3707, 7)); // Hostile Program
checksList.Add(new Check(this, Btl0 + 0x2AEF8, Save + 0x3708, 0)); // MCP
checksList.Add(new Check(this, Btl0 + 0x2AF38, Save + 0x3708, 1)); // Twilight Thorn
checksList.Add(new Check(this, Btl0 + 0x2AF68, Save + 0x3708, 5)); // Volcanic Lord & Blizzard Lord
checksList.Add(new Check(this, Btl0 + 0x2AFA8, Save + 0x3708, 6)); // Queen Minnie Escort
checksList.Add(new Check(this, Btl0 + 0x2B038, Save + 0x3709, 2)); // Abu Escort
checksList.Add(new Check(this, Btl0 + 0x2B078, Save + 0x3709, 3)); // Village Cave Heartless
checksList.Add(new Check(this, Btl0 + 0x2B118, Save + 0x3709, 7)); // Bailey Nobodies
checksList.Add(new Check(this, Btl0 + 0x2B228, Save + 0x370A, 6)); // Station of Serenity Nobodies
checksList.Add(new Check(this, Btl0 + 0x2B268, Save + 0x370B, 1)); // Phil's Training
checksList.Add(new Check(this, Btl0 + 0x2B2A8, Save + 0x370B, 3)); // Grim Reaper I
checksList.Add(new Check(this, Btl0 + 0x2B2E8, Save + 0x370B, 4)); // 1000 Heartless
checksList.Add(new Check(this, Btl0 + 0x2B2F8, Save + 0x370B, 5)); // Solar Sailer Heartless
checksList.Add(new Check(this, Btl0 + 0x2B338, Save + 0x370B, 6)); // The Interceptor Pirates
checksList.Add(new Check(this, Btl0 + 0x2B368, Save + 0x370B, 7)); // Betwixt and Between Nobodies
checksList.Add(new Check(this, Btl0 + 0x2B468, Save + 0x370C, 5)); // Roxas
checksList.Add(new Check(this, Btl0 + 0x2B4F8, Save + 0x370D, 1)); // Axel I
// Bonus (120)
checksList.Add(new Check(this, Btl0 + 0x2A9D8, Save + 0x3704, 2)); // Thresholder - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2A9DA, Save + 0x3704, 2)); // Thresholder - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2AA08, Save + 0x3704, 3)); // Dark Thorn - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2AA0A, Save + 0x3704, 3)); // Dark Thorn - Slot 2 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2AA48, Save + 0x3704, 4)); // Xaldin - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2AA4A, Save + 0x3704, 4)); // Xaldin - Slot 2 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2AA88, Save + 0x3704, 5)); // Cerberus - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2AA8A, Save + 0x3704, 5)); // Cerberus - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2AAA8, Save + 0x3704, 6)); // Pete I - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2AAAA, Save + 0x3704, 6)); // Pete I - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2AAD8, Save + 0x3704, 7)); // Hydra - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2AADA, Save + 0x3704, 7)); // Hydra - Slot 2 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2AB08, Save + 0x3705, 0)); // Hades - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2AB0A, Save + 0x3705, 0)); // Hades - Slot 2 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2AB48, Save + 0x3705, 1)); // Shan Yu - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2AB48, Save + 0x3705, 1)); // Shan Yu - Slot 2 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2AB88, Save + 0x3705, 2)); // Storm Rider - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2AB8A, Save + 0x3705, 2)); // Storm Rider - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2ABC8, Save + 0x3705, 4)); // Beast - Slot 1 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2ABCA, Save + 0x3705, 4)); // Beast - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2ABF8, Save + 0x3705, 7)); // Genie Jafar - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2ABFA, Save + 0x3705, 7)); // Genie Jafar - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2AC08, Save + 0x3706, 0)); // Boat Pete - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2AC0A, Save + 0x3706, 0)); // Boat Pete - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2AC38, Save + 0x3706, 1)); // Pete II - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2AC3A, Save + 0x3706, 1)); // Pete II - Slot 2 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2AC68, Save + 0x3706, 2)); // Prison Keeper - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2AC6A, Save + 0x3706, 2)); // Prison Keeper - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2ACA8, Save + 0x3706, 3)); // Oogie Boogie - Slot 1 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2ACAA, Save + 0x3706, 3)); // Oogie Boogie - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2ACE8, Save + 0x3706, 4)); // The Experiment - Slot 1 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2ACEA, Save + 0x3706, 4)); // The Experiment - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2AD28, Save + 0x3706, 5)); // Barbossa - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2AD2A, Save + 0x3706, 5)); // Barbossa - Slot 2 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2AD68, Save + 0x3706, 6)); // Grim Reaper II - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2AD6A, Save + 0x3706, 6)); // Grim Reaper II - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2ADA8, Save + 0x3706, 7)); // Xigbar - Slot 1 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2ADAA, Save + 0x3706, 7)); // Xigbar - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2ADD8, Save + 0x3707, 0)); // Luxord - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2ADDA, Save + 0x3707, 0)); // Luxord - Slot 2 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2ADE8, Save + 0x3707, 1)); // Saïx - Slot 1 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2ADEA, Save + 0x3707, 1)); // Saïx - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2AE18, Save + 0x3707, 2)); // Xemnas I - Slot 1 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2AE1A, Save + 0x3707, 2)); // Xemnas I - Slot 2 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2AE28, Save + 0x3707, 4)); // Demyx II - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2AE2A, Save + 0x3707, 4)); // Demyx II - Slot 2 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2AE58, Save + 0x3707, 5)); // Scar - Slot 1 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2AE5A, Save + 0x3707, 5)); // Scar - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2AE98, Save + 0x3707, 6)); // Groundshaker - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2AE9A, Save + 0x3707, 6)); // Groundshaker - Slot 2 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2AEB8, Save + 0x3707, 7)); // Hostile Program - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2AEBA, Save + 0x3707, 7)); // Hostile Program - Slot 2 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2AEF8, Save + 0x3708, 0)); // MCP - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2AEFA, Save + 0x3708, 0)); // MCP - Slot 2 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2AF38, Save + 0x3708, 1)); // Twilight Thorn - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2AF3A, Save + 0x3708, 1)); // Twilight Thorn - Slot 2 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2AF48, Save + 0x3708, 2)); // Axel II - Slot 1 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2AF4A, Save + 0x3708, 2)); // Axel II - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2AF58, Save + 0x3708, 3)); // Sephiroth - Slot 1 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2AF5A, Save + 0x3708, 3)); // Sephiroth - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2AF68, Save + 0x3708, 5)); // Volcanic Lord & Blizzard Lord - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2AF6A, Save + 0x3708, 5)); // Volcanic Lord & Blizzard Lord - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2AFA8, Save + 0x3708, 6)); // Queen Minnie Escort - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2AFAA, Save + 0x3708, 6)); // Queen Minnie Escort - Slot 2 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2AFB8, Save + 0x3708, 7)); // The Interceptor Barrels - Slot 1 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2AFBA, Save + 0x3708, 7)); // The Interceptor Barrels - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2AFF8, Save + 0x3709, 0)); // Lock, Shock & Barrel - Slot 1 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2AFFA, Save + 0x3709, 0)); // Lock, Shock & Barrel - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2B038, Save + 0x3709, 2)); // Abu Escort - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2B03A, Save + 0x3709, 2)); // Abu Escort - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2B078, Save + 0x3709, 3)); // Village Cave Heartless - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2B07A, Save + 0x3709, 3)); // Village Cave Heartless - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2B098, Save + 0x3709, 5)); // Dataspace Monitors - Slot 1 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2B09A, Save + 0x3709, 5)); // Dataspace Monitors - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2B0D8, Save + 0x3709, 6)); // Treasure Room Heartless - Slot 1 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2B0DA, Save + 0x3709, 6)); // Treasure Room Heartless - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2B118, Save + 0x3709, 7)); // Bailey Nobodies - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2B11A, Save + 0x3709, 7)); // Bailey Nobodies - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2B128, Save + 0x370A, 1)); // Hyenas I - Slot 1 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2B12A, Save + 0x370A, 1)); // Hyenas I - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2B158, Save + 0x370A, 2)); // Hyenas II - Slot 1 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2B15A, Save + 0x370A, 2)); // Hyenas II - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2B228, Save + 0x370A, 6)); // Station of Serenity Nobodies - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2B22A, Save + 0x370A, 6)); // Station of Serenity Nobodies - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2B238, Save + 0x370B, 0)); // The Old Mansion Nobodies - Slot 1 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2B23A, Save + 0x370B, 0)); // The Old Mansion Nobodies - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2B268, Save + 0x370B, 1)); // Phil's Training - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2B26A, Save + 0x370B, 1)); // Phil's Training - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2B278, Save + 0x370B, 2)); // Demyx I - Slot 1 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2B27A, Save + 0x370B, 2)); // Demyx I - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2B2A8, Save + 0x370B, 3)); // Grim Reaper I - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2B2AA, Save + 0x370B, 3)); // Grim Reaper I - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2B2E8, Save + 0x370B, 4)); // 1000 Heartless - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2B2EA, Save + 0x370B, 4)); // 1000 Heartless - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2B2F8, Save + 0x370B, 5)); // Solar Sailer Heartless - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2B2FA, Save + 0x370B, 5)); // Solar Sailer Heartless - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2B338, Save + 0x370B, 6)); // The Interceptor Pirates - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2B33A, Save + 0x370B, 6)); // The Interceptor Pirates - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2B368, Save + 0x370B, 7)); // Betwixt and Between Nobodies - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2B36A, Save + 0x370B, 7)); // Betwixt and Between Nobodies - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2B378, Save + 0x370C, 0)); // Vexen - Slot 1 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2B37A, Save + 0x370C, 0)); // Vexen - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2B3A8, Save + 0x370C, 1)); // Lexaeus - Slot 1 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2B3AA, Save + 0x370C, 1)); // Lexaeus - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2B3D8, Save + 0x370C, 2)); // Zexion - Slot 1 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2B3DA, Save + 0x370C, 2)); // Zexion - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2B408, Save + 0x370C, 3)); // Marluxia - Slot 1 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2B40A, Save + 0x370C, 3)); // Marluxia - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2B438, Save + 0x370C, 4)); // Larxene - Slot 1 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2B43A, Save + 0x370C, 4)); // Larxene - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2B468, Save + 0x370C, 5)); // Roxas - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2B46A, Save + 0x370C, 5)); // Roxas - Slot 2 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2B478, Save + 0x370C, 6)); // Lingering Will - Slot 1 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2B47A, Save + 0x370C, 6)); // Lingering Will - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2B4A8, Save + 0x370C, 7)); // Xemnas II - Slot 1 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2B4AA, Save + 0x370C, 7)); // Xemnas II - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2B4C8, Save + 0x370D, 0)); // Transport to Remembrance Nobodies III - Slot 1 (Statsanity)
checksList.Add(new Check(this, Btl0 + 0x2B4CA, Save + 0x370D, 0)); // Transport to Remembrance Nobodies III - Slot 2 (Plando)
checksList.Add(new Check(this, Btl0 + 0x2B4F8, Save + 0x370D, 1)); // Axel I - Slot 1
checksList.Add(new Check(this, Btl0 + 0x2B4FA, Save + 0x370D, 1)); // Axel I - Slot 2 (Plando)

// Popup (92, excluding AS and Data) (using corresponding progress flags)
checksList.Add(new Check(this, Sys3 + 0x15606, Save + 0x1DB4, 6)); // Sweet Memories
Expand Down Expand Up @@ -482,7 +567,7 @@ public CheckEveryCheck(MemoryReader mem, int offset, int saveAnchor, int sysAnch
checksList.Add(new Check(this, Sys3 + 0x1564E, Save + 0x1D58, 4)); // Goddess of Fate Cup Fatal Crest (slightly early)
checksList.Add(new Check(this, Sys3 + 0x1565A, Save + 0x1D58, 4)); // Goddess of Fate Cup Orichalcum+ (slightly early)
checksList.Add(new Check(this, Sys3 + 0x15696, Save + 0x1D5A, 1)); // Hades Cup Trophy (slightly early)
checksList.Add(new Check(this, Sys3 + 0x15474, Save + 0x1E92, 4)); // Isla de Muerta Map
checksList.Add(new Check(this, Sys3 + 0x1547A, Save + 0x1E92, 4)); // Isla de Muerta Map
checksList.Add(new Check(this, Sys3 + 0x15486, Save + 0x1E93, 6)); // Follow the Wind
checksList.Add(new Check(this, Sys3 + 0x1556A, Save + 0x1E95, 2)); // Cursed Medallion
checksList.Add(new Check(this, Sys3 + 0x15576, Save + 0x1E95, 2)); // Ship Graveyard Map
Expand Down