From d681c65480683b8c161a2ff2c5028f033ee83b76 Mon Sep 17 00:00:00 2001
From: lepelog <25211966+lepelog@users.noreply.github.com>
Date: Thu, 10 Aug 2023 11:32:03 +0200
Subject: UnkFlagStuff cleanup

---
 src/toBeSorted/unk_flag_stuff.cpp | 63 ++++++++++++++++++++++++++++++
 src/unk_flag_stuff.cpp            | 82 ---------------------------------------
 2 files changed, 63 insertions(+), 82 deletions(-)
 create mode 100644 src/toBeSorted/unk_flag_stuff.cpp
 delete mode 100644 src/unk_flag_stuff.cpp

(limited to 'src')

diff --git a/src/toBeSorted/unk_flag_stuff.cpp b/src/toBeSorted/unk_flag_stuff.cpp
new file mode 100644
index 00000000..e755a7a5
--- /dev/null
+++ b/src/toBeSorted/unk_flag_stuff.cpp
@@ -0,0 +1,63 @@
+#pragma once
+
+#include <toBeSorted/unk_flag_stuff.h>
+
+u16 UnkFlagStuff::calculateMask(s32 shift) {
+    return (2 << (shift & 0xF)) - 1;
+}
+
+void UnkFlagStuff::doNothing(u32 unused) {}
+
+UnkFlagStuff::UnkFlagStuff(u16 count, UnkFlagDefinition* definitions) {
+    this->mDefinitionsCount = count;
+    this->mpDefinitions = definitions;
+}
+
+void UnkFlagStuff::prepareIndexShiftMask(u16 counterIdx, u32 unused, u16* indexPtr, u8* shiftPtr, u16* maskPtr) {
+    doNothing(counterIdx);
+    *indexPtr = mpDefinitions[counterIdx].mIndex;
+    *shiftPtr = mpDefinitions[counterIdx].mShiftMask >> 4;
+    *maskPtr = calculateMask(mpDefinitions[counterIdx].mShiftMask);
+}
+
+u16 UnkFlagStuff::maskForIdx(u16 index) {
+    doNothing(index);
+
+    return calculateMask(mpDefinitions[index].mShiftMask);
+}
+
+u32 UnkFlagStuff::getCounterOrFlag(u16 counterIdx, u16* dataPtr, u32 param4) {
+    u16 index = 0;
+    u8 shift = 0;
+    u16 mask = 0;
+    prepareIndexShiftMask(counterIdx, param4, &index, &shift, &mask);
+    return mask & (dataPtr[index] >> shift);
+}
+
+void UnkFlagStuff::setCounterOrFlag(u16 counterIdx, u16* dataPtr, u32 flagCount, u32 value) {
+    u16 index = 0;
+    u8 shift = 0;
+    u16 mask = 0;
+    prepareIndexShiftMask(counterIdx, flagCount, &index, &shift, &mask);
+    dataPtr[index] &= ~(mask << shift);
+    dataPtr[index] = (u16)(value << shift) | dataPtr[index];
+}
+
+inline bool isLessThan(int a, int b) {
+    return a <= b;
+}
+
+u32 UnkFlagStuff::checkFlagValid(u16 counterIdx, u32 flagCount) {
+    if (mpDefinitions == nullptr) {
+        return 0;
+    }
+    if (mDefinitionsCount <= counterIdx || mpDefinitions[counterIdx].mIndex == 0xFF) {
+        return 0;
+    } else {
+        if (isLessThan(flagCount, mpDefinitions[counterIdx].mIndex)) {
+            return 0;
+        } else {
+            return 1;
+        }
+    }
+}
diff --git a/src/unk_flag_stuff.cpp b/src/unk_flag_stuff.cpp
deleted file mode 100644
index b68696dd..00000000
--- a/src/unk_flag_stuff.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-#pragma once
-
-#include <types.h>
-
-struct UnkFlagDefinition {
-    u8 index;
-    u8 shiftMask;
-};
-
-class UnkFlagStuff {
-u16 definitionsCount;
-UnkFlagDefinition* definitions;
-public:
-    u16 calculateMask(s32 shift);
-    void doNothing(u32 unused);
-    UnkFlagStuff(u16 count, UnkFlagDefinition* definitions);
-    void prepareIndexShiftMask(u16 counterIdx, u32 unused, u16* indexPtr, u8* shiftPtr, u16* maskPtr);
-    u16 maskForIdx(u16 index);
-    u32 getCounterOrFlag(u16 counterIdx, u16* dataPtr, u32 param4);
-    void setCounterOrFlag(u16 counterIdx, u16* dataPtr, u32 flagCount, u32 value);
-    u32 unk(u16 param1, u32 param2);
-};
-
-u16 UnkFlagStuff::calculateMask(s32 shift) {
-    return (2 << (shift & 0xF)) - 1;
-}
-
-void UnkFlagStuff::doNothing(u32 unused) {}
-
-UnkFlagStuff::UnkFlagStuff(u16 count, UnkFlagDefinition* definitions) {
-    this->definitionsCount = count;
-    this->definitions = definitions;
-}
-
-void UnkFlagStuff::prepareIndexShiftMask(u16 counterIdx, u32 unused, u16* indexPtr, u8* shiftPtr, u16* maskPtr) {
-    doNothing(counterIdx);
-    *indexPtr = definitions[counterIdx].index;
-    *shiftPtr = definitions[counterIdx].shiftMask >> 4;
-    *maskPtr = calculateMask(definitions[counterIdx].shiftMask);
-}
-
-u16 UnkFlagStuff::maskForIdx(u16 index) {
-    doNothing(index);
-
-    return calculateMask(definitions[index].shiftMask);
-}
-
-u32 UnkFlagStuff::getCounterOrFlag(u16 counterIdx, u16* dataPtr, u32 param4) {
-    u16 index = 0;
-    u8 shift = 0;
-    u16 mask = 0;
-    prepareIndexShiftMask(counterIdx, param4, &index, &shift, &mask);
-    return mask & (dataPtr[index] >> shift);
-}
-
-void UnkFlagStuff::setCounterOrFlag(u16 counterIdx, u16* dataPtr, u32 flagCount, u32 value) {
-    u16 index = 0;
-    u8 shift = 0;
-    u16 mask = 0;
-    prepareIndexShiftMask(counterIdx, flagCount, &index, &shift, &mask);
-    dataPtr[index] &= ~(mask << shift);
-    dataPtr[index] = (u16)(value << shift) | dataPtr[index];
-}
-
-inline bool check(int a, int b) {
-    return a <= b;
-}
-
-u32 UnkFlagStuff::unk(u16 param1, u32 param2) {
-    if (definitions == nullptr) {
-        return 0;
-    }
-    if (definitionsCount <= param1 || definitions[param1].index == 0xFF) {
-        return 0;
-    } else {
-        if (!check(param2, definitions[param1].index)) {
-            return 1;
-        } else {
-            return 0;
-        }
-    }
-}
-- 
cgit v1.2.3