Major cleanup.

1 files changed, 10 insertions, 7 deletions

@@ -4,24 +4,27 @@ int SWAP_NONE = 0x0;
 int SWAP_TARGETS = 0x1;
 int SWAP_LINES = 0x2;
 int SWAP_STYLE = 0x4;
-int SWAP_BACK_DISTANCE = 0x8;
 
 class WitnessRandomizer {
 public:
-
         WitnessRandomizer();
 
         void Randomize(std::vector<int> &panels, int flags);
         void RandomizeRange(std::vector<int> &panels, int flags, size_t startIndex, size_t endIndex);
         void SwapPanels(int panel1, int panel2, int flags);
         void ReassignTargets(const std::vector<int>& panels, const std::vector<int>& order);
-        void Overwrite(int panel1, int panel2, int offset, int size);
 
-//private:
-        void TurnOn(int panel);
-        void TurnOff(int panel);
+        template <class T>
+        std::vector<T> ReadPanelData(int panel, int offset, int size) {
+                return _memory.ReadData<T>({_globals, 0x18, panel*8, offset}, size);
+        }
 
-        void SwapPanelData(int panel1, int panel2, int finalOffset, int dataSize);
+        template <class T>
+        void WritePanelData(int panel, int offset, const std::vector<T>& data) {
+                _memory.WriteData<T>({_globals, 0x18, panel*8, offset}, data);
+        }
 
+private:
         Memory _memory;
+        int _globals = 0x5B28C0;
 };
\ No newline at end of file