Fix GBC banked map output

Optiroc · Oct 1, 2019 · 2bcece4 · 2bcece4
1 parent 9a53080
commit 2bcece4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/src/Common.h b/src/Common.h
@@ -36,7 +36,7 @@ typedef std::vector<rgba_set_t> rgba_set_vec_t;
 
 namespace sfc {
 
-constexpr const char* VERSION = "0.8.6";
+constexpr const char* VERSION = "0.8.7";
 
 constexpr const char* COPYRIGHT = "Copyright (c) 2017-2019 David Lindecrantz";
 

diff --git a/src/Map.cpp b/src/Map.cpp
@@ -89,9 +89,8 @@ byte_vec_t Map::gbc_banked_data() const {
 
   const auto linear_data = native_data();
   auto banked_data = byte_vec_t(linear_data.size());
-  for (unsigned i = 0; i < linear_data.size(); ++i) {
-    banked_data[!(i % 2) ? i >> 2 : (i >> 2) + (32 * 32)] = linear_data[i];
-  }
+  for (unsigned i = 0; i < linear_data.size() >> 1; ++i) banked_data[i] = linear_data[i << 1];
+  for (unsigned i = 0; i < linear_data.size() >> 1; ++i) banked_data[i + (linear_data.size() >> 1)] = linear_data[(i << 1) + 1];
   return banked_data;
 }
 

diff --git a/src/superfamiconv.cpp b/src/superfamiconv.cpp
@@ -7,7 +7,6 @@
 // TODO: Check map output with tiles using duplicate colors (#8)
 // TODO: Don't always pad native palette output? (Pad every palette but the last? Option?)
 // TODO: Add more palette packing algorithms
-// MAYBE: In sprite-mode, output matched palette metadata
 
 #include <Options.h>