mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-08-06 18:02:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix one of the dowsing_target functions (#84)

Browse Source
This commit is contained in:
robojumper
2024-10-28 05:02:53 +01:00
committed by GitHub
parent a2f2321da0
commit 6b9d1737d4
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/toBeSorted/dowsing_target.cpp
+8 -5
View File
@@ -72,12 +72,15 @@ bool DowsingTarget::hasDesertNodeDowsing() {
return StoryflagManager::sInstance->getCounterOrFlag(107) && !StoryflagManager::sInstance->getCounterOrFlag(8);
}
inline bool checkTrial(u16 itemflag, u16 storyflag) {
return (ItemflagManager::sInstance->getFlagDirect(itemflag) && !StoryflagManager::sInstance->getCounterOrFlag(storyflag)) ? true : false;
}
bool DowsingTarget::hasAnyTrialDowsing() {
// TODO more complicated code
return ItemflagManager::sInstance->getFlag(187) && !StoryflagManager::sInstance->getCounterOrFlag(93) ||
ItemflagManager::sInstance->getFlag(188) && !StoryflagManager::sInstance->getCounterOrFlag(97) ||
ItemflagManager::sInstance->getFlag(189) && !StoryflagManager::sInstance->getCounterOrFlag(98) ||
ItemflagManager::sInstance->getFlag(193) && !StoryflagManager::sInstance->getCounterOrFlag(99);
return checkTrial(187, 93) ||
checkTrial(188, 97) ||
checkTrial(189, 98) ||
checkTrial(193, 99);
}
bool DowsingTarget::hasSacredWaterDowsing() {