Archive/Shipwright
0
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-04-28 21:27:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix checking gSaveContext for used small keys (#5346)

Browse source
This commit is contained in:
Christopher Leggett 2025-04-07 19:07:07 -04:00 • committed by GitHub
parent 4acbf799cc
commit b71a0c5803
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
soh/soh/Enhancements/randomizer/logic.cpp
View file

@ -2244,7 +2244,7 @@ const std::vector<uint8_t>& GetDungeonSmallKeyDoors(SceneID sceneId) {
return dungeonSmallKeyDoors[key]; return dungeonSmallKeyDoors[key];
} }
int8_t GetUsedSmallKeyCount(SceneID sceneId) { int8_t Logic::GetUsedSmallKeyCount(SceneID sceneId) {
const auto& smallKeyDoors = GetDungeonSmallKeyDoors(sceneId); const auto& smallKeyDoors = GetDungeonSmallKeyDoors(sceneId);
// Get the swch value for the scene // Get the swch value for the scene
@ -2252,7 +2252,7 @@ int8_t GetUsedSmallKeyCount(SceneID sceneId) {
if (gPlayState != nullptr && gPlayState->sceneNum == sceneId) { if (gPlayState != nullptr && gPlayState->sceneNum == sceneId) {
swch = gPlayState->actorCtx.flags.swch; swch = gPlayState->actorCtx.flags.swch;
} else { } else {
swch = gSaveContext.sceneFlags[sceneId].swch; swch = mSaveContext->sceneFlags[sceneId].swch;
} }
// Count the number of small keys doors unlocked // Count the number of small keys doors unlocked

1
soh/soh/Enhancements/randomizer/logic.h
View file

@ -267,6 +267,7 @@ class Logic {
bool CheckEquipment(uint32_t item); bool CheckEquipment(uint32_t item);
bool CheckQuestItem(uint32_t item); bool CheckQuestItem(uint32_t item);
void SetQuestItem(uint32_t item, bool state); void SetQuestItem(uint32_t item, bool state);
int8_t GetUsedSmallKeyCount(SceneID sceneId);
uint8_t GetSmallKeyCount(uint32_t dungeonIndex); uint8_t GetSmallKeyCount(uint32_t dungeonIndex);
void SetSmallKeyCount(uint32_t dungeonIndex, uint8_t count); void SetSmallKeyCount(uint32_t dungeonIndex, uint8_t count);
bool CheckDungeonItem(uint32_t item, uint32_t dungeonIndex); bool CheckDungeonItem(uint32_t item, uint32_t dungeonIndex);