diff options
| author | robojumper <robojumper@gmail.com> | 2024-10-28 05:02:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-28 00:02:53 -0400 |
| commit | 6b9d1737d481005b925702525efc232a933269e0 (patch) | |
| tree | 0f34702196264b61c6c03bba4ea9bea5568ba1d0 /src/toBeSorted/dowsing_target.cpp | |
| parent | a2f2321da0354c219fb5b51bd2a40210b69d1809 (diff) | |
Fix one of the dowsing_target functions (#84)
Diffstat (limited to 'src/toBeSorted/dowsing_target.cpp')
| -rw-r--r-- | src/toBeSorted/dowsing_target.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/toBeSorted/dowsing_target.cpp b/src/toBeSorted/dowsing_target.cpp index 41acf5bf..0dbf031e 100644 --- a/src/toBeSorted/dowsing_target.cpp +++ b/src/toBeSorted/dowsing_target.cpp @@ -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() { |