KH2: Version 2 (#2009)

Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com>
Co-authored-by: Joe Prochaska <prochaska.joseph@gmail.com>
This commit is contained in:
JaredWeakStrike
2023-11-25 09:46:00 -05:00
committed by GitHub
parent c138918400
commit 2ccf11f3d7
24 changed files with 6341 additions and 4882 deletions

View File

@@ -96,6 +96,10 @@ DC_Checks = {
LocationName.LingeringWillBonus: WorldLocationData(0x370C, 6),
LocationName.LingeringWillProofofConnection: WorldLocationData(0x370C, 6),
LocationName.LingeringWillManifestIllusion: WorldLocationData(0x370C, 6),
'Lingering Will Bonus: Sora Slot 1': WorldLocationData(14092, 6),
'Lingering Will Proof of Connection': WorldLocationData(14092, 6),
'Lingering Will Manifest Illusion': WorldLocationData(14092, 6),
}
TR_Checks = {
LocationName.CornerstoneHillMap: WorldLocationData(0x23B2, 0),
@@ -226,6 +230,8 @@ BC_Checks = {
LocationName.DonaldXaldinGetBonus: WorldLocationData(0x3704, 4),
LocationName.SecretAnsemReport4: WorldLocationData(0x1D31, 2),
LocationName.XaldinDataDefenseBoost: WorldLocationData(0x1D34, 7),
'Data Xaldin': WorldLocationData(7476, 7),
}
SP_Checks = {
LocationName.PitCellAreaMap: WorldLocationData(0x23CA, 2),
@@ -351,6 +357,7 @@ HB_Checks = {
LocationName.RestorationSiteMoonRecipe: WorldLocationData(0x23C9, 3),
LocationName.RestorationSiteAPBoost: WorldLocationData(0x23DB, 2),
LocationName.DemyxHB: WorldLocationData(0x3707, 4),
'(HB) Demyx Bonus: Donald Slot 1': WorldLocationData(14087, 4),
LocationName.DemyxHBGetBonus: WorldLocationData(0x3707, 4),
LocationName.DonaldDemyxHBGetBonus: WorldLocationData(0x3707, 4),
LocationName.FFFightsCureElement: WorldLocationData(0x1D14, 6),
@@ -409,6 +416,25 @@ HB_Checks = {
LocationName.VexenASRoadtoDiscovery: WorldLocationData(0x370C, 0),
LocationName.VexenDataLostIllusion: WorldLocationData(0x370C, 0), #
LocationName.DemyxDataAPBoost: WorldLocationData(0x1D26, 5),
'Lexaeus Bonus: Sora Slot 1': WorldLocationData(14092, 1),
'AS Lexaeus': WorldLocationData(14092, 1),
'Data Lexaeus': WorldLocationData(14092, 1),
'Marluxia Bonus: Sora Slot 1': WorldLocationData(14092, 3),
'AS Marluxia': WorldLocationData(14092, 3),
'Data Marluxia': WorldLocationData(14092, 3),
'Zexion Bonus: Sora Slot 1': WorldLocationData(14092, 2),
'Zexion Bonus: Goofy Slot 1': WorldLocationData(14092, 2),
'AS Zexion': WorldLocationData(14092, 2),
'Data Zexion': WorldLocationData(14092, 2),
'Larxene Bonus: Sora Slot 1': WorldLocationData(14092, 4),
'AS Larxene': WorldLocationData(14092, 4),
'Data Larxene': WorldLocationData(14092, 4),
'Vexen Bonus: Sora Slot 1': WorldLocationData(14092, 0),
'AS Vexen': WorldLocationData(14092, 0),
'Data Vexen': WorldLocationData(14092, 0),
'Data Demyx': WorldLocationData(7462, 5),
LocationName.GardenofAssemblageMap: WorldLocationData(0x23DF, 1),
LocationName.GoALostIllusion: WorldLocationData(0x23DF, 2),
LocationName.ProofofNonexistence: WorldLocationData(0x23DF, 3),
@@ -549,50 +575,97 @@ TT_Checks = {
LocationName.BetwixtandBetween: WorldLocationData(0x370B, 7),
LocationName.BetwixtandBetweenBondofFlame: WorldLocationData(0x1CE9, 1),
LocationName.AxelDataMagicBoost: WorldLocationData(0x1CEB, 4),
'Data Axel': WorldLocationData(7403, 4),
}
TWTNW_Checks = {
LocationName.FragmentCrossingMythrilStone: WorldLocationData(0x23CB, 4),
LocationName.FragmentCrossingMythrilCrystal: WorldLocationData(0x23CB, 5),
LocationName.FragmentCrossingAPBoost: WorldLocationData(0x23CB, 6),
LocationName.FragmentCrossingOrichalcum: WorldLocationData(0x23CB, 7),
LocationName.Roxas: WorldLocationData(0x370C, 5),
LocationName.RoxasGetBonus: WorldLocationData(0x370C, 5),
LocationName.RoxasSecretAnsemReport8: WorldLocationData(0x1ED1, 1),
LocationName.TwoBecomeOne: WorldLocationData(0x1ED1, 1),
LocationName.MemorysSkyscaperMythrilCrystal: WorldLocationData(0x23CD, 3),
LocationName.MemorysSkyscaperAPBoost: WorldLocationData(0x23DC, 0),
LocationName.MemorysSkyscaperMythrilStone: WorldLocationData(0x23DC, 1),
LocationName.TheBrinkofDespairDarkCityMap: WorldLocationData(0x23CA, 5),
LocationName.TheBrinkofDespairOrichalcumPlus: WorldLocationData(0x23DA, 2),
LocationName.NothingsCallMythrilGem: WorldLocationData(0x23CC, 0),
LocationName.NothingsCallOrichalcum: WorldLocationData(0x23CC, 1),
LocationName.TwilightsViewCosmicBelt: WorldLocationData(0x23CA, 6),
LocationName.XigbarBonus: WorldLocationData(0x3706, 7),
LocationName.XigbarSecretAnsemReport3: WorldLocationData(0x1ED2, 2),
LocationName.NaughtsSkywayMythrilGem: WorldLocationData(0x23CC, 2),
LocationName.NaughtsSkywayOrichalcum: WorldLocationData(0x23CC, 3),
LocationName.NaughtsSkywayMythrilCrystal: WorldLocationData(0x23CC, 4),
LocationName.Oblivion: WorldLocationData(0x1ED2, 4),
LocationName.CastleThatNeverWasMap: WorldLocationData(0x1ED2, 4),
LocationName.Luxord: WorldLocationData(0x3707, 0),
LocationName.LuxordGetBonus: WorldLocationData(0x3707, 0),
LocationName.LuxordSecretAnsemReport9: WorldLocationData(0x1ED2, 7),
LocationName.SaixBonus: WorldLocationData(0x3707, 1),
LocationName.SaixSecretAnsemReport12: WorldLocationData(0x1ED3, 2),
LocationName.PreXemnas1SecretAnsemReport11: WorldLocationData(0x1ED3, 6),
LocationName.RuinandCreationsPassageMythrilStone: WorldLocationData(0x23CC, 7),
LocationName.RuinandCreationsPassageAPBoost: WorldLocationData(0x23CD, 0),
LocationName.RuinandCreationsPassageMythrilCrystal: WorldLocationData(0x23CD, 1),
LocationName.RuinandCreationsPassageOrichalcum: WorldLocationData(0x23CD, 2),
LocationName.Xemnas1: WorldLocationData(0x3707, 2),
LocationName.Xemnas1GetBonus: WorldLocationData(0x3707, 2),
LocationName.Xemnas1SecretAnsemReport13: WorldLocationData(0x1ED4, 5),
LocationName.FinalXemnas: WorldLocationData(0x1ED8, 1),
LocationName.XemnasDataPowerBoost: WorldLocationData(0x1EDA, 2),
LocationName.XigbarDataDefenseBoost: WorldLocationData(0x1ED9, 7),
LocationName.SaixDataDefenseBoost: WorldLocationData(0x1EDA, 0),
LocationName.LuxordDataAPBoost: WorldLocationData(0x1EDA, 1),
LocationName.RoxasDataMagicBoost: WorldLocationData(0x1ED9, 6),
LocationName.FragmentCrossingMythrilStone: WorldLocationData(0x23CB, 4),
LocationName.FragmentCrossingMythrilCrystal: WorldLocationData(0x23CB, 5),
LocationName.FragmentCrossingAPBoost: WorldLocationData(0x23CB, 6),
LocationName.FragmentCrossingOrichalcum: WorldLocationData(0x23CB, 7),
LocationName.Roxas: WorldLocationData(0x370C, 5),
LocationName.RoxasGetBonus: WorldLocationData(0x370C, 5),
LocationName.RoxasSecretAnsemReport8: WorldLocationData(0x1ED1, 1),
LocationName.TwoBecomeOne: WorldLocationData(0x1ED1, 1),
LocationName.MemorysSkyscaperMythrilCrystal: WorldLocationData(0x23CD, 3),
LocationName.MemorysSkyscaperAPBoost: WorldLocationData(0x23DC, 0),
LocationName.MemorysSkyscaperMythrilStone: WorldLocationData(0x23DC, 1),
LocationName.TheBrinkofDespairDarkCityMap: WorldLocationData(0x23CA, 5),
LocationName.TheBrinkofDespairOrichalcumPlus: WorldLocationData(0x23DA, 2),
LocationName.NothingsCallMythrilGem: WorldLocationData(0x23CC, 0),
LocationName.NothingsCallOrichalcum: WorldLocationData(0x23CC, 1),
LocationName.TwilightsViewCosmicBelt: WorldLocationData(0x23CA, 6),
LocationName.XigbarBonus: WorldLocationData(0x3706, 7),
LocationName.XigbarSecretAnsemReport3: WorldLocationData(0x1ED2, 2),
LocationName.NaughtsSkywayMythrilGem: WorldLocationData(0x23CC, 2),
LocationName.NaughtsSkywayOrichalcum: WorldLocationData(0x23CC, 3),
LocationName.NaughtsSkywayMythrilCrystal: WorldLocationData(0x23CC, 4),
LocationName.Oblivion: WorldLocationData(0x1ED2, 4),
LocationName.CastleThatNeverWasMap: WorldLocationData(0x1ED2, 4),
LocationName.Luxord: WorldLocationData(0x3707, 0),
LocationName.LuxordGetBonus: WorldLocationData(0x3707, 0),
LocationName.LuxordSecretAnsemReport9: WorldLocationData(0x1ED2, 7),
LocationName.SaixBonus: WorldLocationData(0x3707, 1),
LocationName.SaixSecretAnsemReport12: WorldLocationData(0x1ED3, 2),
LocationName.PreXemnas1SecretAnsemReport11: WorldLocationData(0x1ED3, 6),
LocationName.RuinandCreationsPassageMythrilStone: WorldLocationData(0x23CC, 7),
LocationName.RuinandCreationsPassageAPBoost: WorldLocationData(0x23CD, 0),
LocationName.RuinandCreationsPassageMythrilCrystal: WorldLocationData(0x23CD, 1),
LocationName.RuinandCreationsPassageOrichalcum: WorldLocationData(0x23CD, 2),
LocationName.Xemnas1: WorldLocationData(0x3707, 2),
LocationName.Xemnas1GetBonus: WorldLocationData(0x3707, 2),
LocationName.Xemnas1SecretAnsemReport13: WorldLocationData(0x1ED4, 5),
LocationName.FinalXemnas: WorldLocationData(0x1ED8, 1),
LocationName.XemnasDataPowerBoost: WorldLocationData(0x1EDA, 2),
LocationName.XigbarDataDefenseBoost: WorldLocationData(0x1ED9, 7),
LocationName.SaixDataDefenseBoost: WorldLocationData(0x1EDA, 0),
LocationName.LuxordDataAPBoost: WorldLocationData(0x1EDA, 1),
LocationName.RoxasDataMagicBoost: WorldLocationData(0x1ED9, 6),
"(TWTNW) Roxas Bonus: Sora Slot 1": WorldLocationData(14092, 5),
"(TWTNW) Roxas Bonus: Sora Slot 2": WorldLocationData(14092, 5),
"(TWTNW) Roxas Secret Ansem Report 8": WorldLocationData(7889, 1),
"(TWTNW) Two Become One": WorldLocationData(7889, 1),
"(TWTNW) Memory's Skyscaper Mythril Crystal": WorldLocationData(9165, 3),
"(TWTNW) Memory's Skyscaper AP Boost": WorldLocationData(9180, 0),
"(TWTNW) Memory's Skyscaper Mythril Stone": WorldLocationData(9180, 1),
"(TWTNW) The Brink of Despair Dark City Map": WorldLocationData(9162, 5),
"(TWTNW) The Brink of Despair Orichalcum+": WorldLocationData(9178, 2),
"(TWTNW) Nothing's Call Mythril Gem": WorldLocationData(9164, 0),
"(TWTNW) Nothing's Call Orichalcum": WorldLocationData(9164, 1),
"(TWTNW) Twilight's View Cosmic Belt": WorldLocationData(9162, 6),
"(TWTNW) Xigbar Bonus: Sora Slot 1": WorldLocationData(14086, 7),
"(TWTNW) Xigbar Secret Ansem Report 3": WorldLocationData(7890, 2),
"(TWTNW) Naught's Skyway Mythril Gem": WorldLocationData(9164, 2),
"(TWTNW) Naught's Skyway Orichalcum": WorldLocationData(9164, 3),
"(TWTNW) Naught's Skyway Mythril Crystal": WorldLocationData(9164, 4),
"(TWTNW) Oblivion": WorldLocationData(7890, 4),
"(TWTNW) Castle That Never Was Map": WorldLocationData(7890, 4),
"(TWTNW) Luxord": WorldLocationData(14087, 0),
"(TWTNW) Luxord Bonus: Sora Slot 1": WorldLocationData(14087, 0),
"(TWTNW) Luxord Secret Ansem Report 9": WorldLocationData(7890, 7),
"(TWTNW) Saix Bonus: Sora Slot 1": WorldLocationData(14087, 1),
"(TWTNW) Saix Secret Ansem Report 12": WorldLocationData(7891, 2),
"(TWTNW) Secret Ansem Report 11 (Pre-Xemnas 1)": WorldLocationData(7891, 6),
"(TWTNW) Ruin and Creation's Passage Mythril Stone": WorldLocationData(9164, 7),
"(TWTNW) Ruin and Creation's Passage AP Boost": WorldLocationData(9165, 0),
"(TWTNW) Ruin and Creation's Passage Mythril Crystal": WorldLocationData(9165, 1),
"(TWTNW) Ruin and Creation's Passage Orichalcum": WorldLocationData(9165, 2),
"(TWTNW) Xemnas 1 Bonus: Sora Slot 1": WorldLocationData(14087, 2),
"(TWTNW) Xemnas 1 Bonus: Sora Slot 2": WorldLocationData(14087, 2),
"(TWTNW) Xemnas 1 Secret Ansem Report 13": WorldLocationData(7892, 5),
"Data Xemnas": WorldLocationData(7898, 2),
"Data Xigbar": WorldLocationData(7897, 7),
"Data Saix": WorldLocationData(7898, 0),
"Data Luxord": WorldLocationData(7898, 1),
"Data Roxas": WorldLocationData(7897, 6),
}
Atlantica_Checks = {
LocationName.UnderseaKingdomMap: WorldLocationData(0x1DF4, 2),
LocationName.MysteriousAbyss: WorldLocationData(0x1DF5, 3),
LocationName.MusicalOrichalcumPlus: WorldLocationData(0x1DF4, 1),
LocationName.MusicalBlizzardElement: WorldLocationData(0x1DF4, 1)
}
SoraLevels = {
# LocationName.Lvl1: WorldLocationData(0xFFFF,1),
@@ -743,6 +816,15 @@ FinalLevels = {
LocationName.Finallvl6: WorldLocationData(0x33D6, 6),
LocationName.Finallvl7: WorldLocationData(0x33D6, 7),
}
SummonLevels = {
LocationName.Summonlvl2: WorldLocationData(0x3526, 2),
LocationName.Summonlvl3: WorldLocationData(0x3526, 3),
LocationName.Summonlvl4: WorldLocationData(0x3526, 4),
LocationName.Summonlvl5: WorldLocationData(0x3526, 5),
LocationName.Summonlvl6: WorldLocationData(0x3526, 6),
LocationName.Summonlvl7: WorldLocationData(0x3526, 7),
}
weaponSlots = {
LocationName.AdamantShield: WorldLocationData(0x35E6, 1),
@@ -817,7 +899,6 @@ tornPageLocks = {
all_world_locations = {
**TWTNW_Checks,
**TT_Checks,
**TT_Checks,
**HB_Checks,
**BC_Checks,
**Oc_Checks,
@@ -828,11 +909,9 @@ all_world_locations = {
**DC_Checks,
**TR_Checks,
**HT_Checks,
**HB_Checks,
**PR_Checks,
**SP_Checks,
**TWTNW_Checks,
**HB_Checks,
**Atlantica_Checks,
}
levels_locations = {