From f8c5a8988b3ada3e12d6b978ca67b04d4d929fd3 Mon Sep 17 00:00:00 2001 From: gymnast86 Date: Sat, 13 Jun 2026 20:57:32 -0400 Subject: [PATCH] fix getTempleKeysFound --- src/dusk/randomizer/game/tools.cpp | 7 +++---- src/dusk/randomizer/game/tools.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/dusk/randomizer/game/tools.cpp b/src/dusk/randomizer/game/tools.cpp index f0d828cb7a..71791ba9d2 100644 --- a/src/dusk/randomizer/game/tools.cpp +++ b/src/dusk/randomizer/game/tools.cpp @@ -153,7 +153,7 @@ int numMirrorShards() { return numMirrorShards; } -int getTempleKeysFound(int stage) { +int getTempleKeysFound(int saveId) { static std::unordered_map> keyDoorFlags = { {0xA, {0x0}}, {0x10, {0x7, 0xB, 0x2B, 0x3E}}, @@ -167,11 +167,10 @@ int getTempleKeysFound(int stage) { {0x18, {0x4C, 0x6F, 0x7C}} }; - int count = dComIfGs_getKeyNum(stage); - int saveId = getStageSaveId(stage); + int count = dComIfGs_getKeyNum(saveId); // Add number of unlocked key doors for this dungeon to current key count - for (auto flag : keyDoorFlags[stage]) { + for (auto flag : keyDoorFlags[saveId]) { if (tracker_isStageSwitch(saveId, flag)) { count += 1; } diff --git a/src/dusk/randomizer/game/tools.h b/src/dusk/randomizer/game/tools.h index dba138a4bd..74995bd5a8 100644 --- a/src/dusk/randomizer/game/tools.h +++ b/src/dusk/randomizer/game/tools.h @@ -17,7 +17,7 @@ u16 getItemMessageID(u8 itemId); int numCompletedDungeons(); int numFusedShadows(); int numMirrorShards(); -int getTempleKeysFound(int stage); +int getTempleKeysFound(int saveId); /* * Reads the current player inventory and returns an ItemPool that can be used for logic searches