Convert some singleton access to getters

1 files changed, 4 insertions, 6 deletions

diff --git a/src/d/a/d_a_item.cpp b/src/d/a/d_a_item.cpp
index d49b3ecf..56ee740f 100644
--- a/src/d/a/d_a_item.cpp
+++ b/src/d/a/d_a_item.cpp
@@ -272,12 +272,10 @@ bool dAcItemBase_c::setDungeonFlagForTear(int tearNum) {
     if (!getFlagIdxForTear(tearNum, &flag_idx)) {
         return false;
     }
-    // idk
-    int idx = DungeonflagManager::sInstance->mStageIndex;
-    const u16 *pData = FileManager::sInstance->getDungeonFlagsConst() + ((idx & 0x1FFF) * 4);
-    u32 counterMask = DungeonflagManager::sInstance->mpFlagIndex->getCounterOrFlag(flag_idx, pData, 8);
-    u32 tearMask = getTearBit(tearNum);
-    DungeonflagManager::sInstance->setToValue(flag_idx, tearMask | counterMask);
+    u16 oldVal = DungeonflagManager::sInstance->getCounterOrFlag(flag_idx, 8);
+    u16 tearBit = getTearBit(tearNum);
+    u16 newVal = tearBit | oldVal;
+    DungeonflagManager::sInstance->setToValue(flag_idx, newVal);
     return true;
 }