2 files changed, 51 insertions, 12 deletions

@@ -154,6 +154,8 @@ public:
     }
   }
 
+  explicit Palette(std::vector<Magick::Color> colors) : colors_(colors) {}
+
   const std::vector<Magick::Color>& Colors() const { return colors_; }
 
 private:
@@ -121,12 +121,13 @@ public:
     BufferView m3,
     int roomNum,
     RoomInfo roomInfo,
-    RoomGfxPal roomGfxPal)
+    std::vector<Palette> palettes,
+    std::vector<std::vector<char>> tilesets)
       : roomNum_(roomNum),
         width_(roomInfo.width),
         height_(roomInfo.height),
-        palettes_(roomGfxPal.GetPalettes(m3)),
-        tilesets_(roomGfxPal.GetTilesets(m3)),
+        palettes_(palettes),
+        tilesets_(tilesets),
         mapTiles_(GetMapTiles(m3, roomNum)),
         mapLayers_(GetMapLayers(m3, roomNum))
   {
@@ -149,12 +150,6 @@ public:
 
       itemised_.push_back(std::move(newLayer));
     }
-
-    // Debug info
-    std::cout << width_ << "," << height_ << std::endl;
-    std::cout << roomGfxPal.paletteId;
-    for (int i=0;i<12;i++) std::cout << "," << roomGfxPal.tilesetId[i];
-    std::cout << std::endl;
   }
 
   Magick::Image renderTile(size_t metatile_id, bool tflipx, bool tflipy) const {
@@ -297,20 +292,62 @@ using globaltile_id = globaltile_identifier::id_type;
 
 int main(int argc, char** argv) {
   if (argc < 3) {
-    std::cout << "Usage: ./tileset_dumper [path to rom] {map ID}" << std::endl;
+    std::cout << "Usage: ./tileset_dumper [path to rom] [--palette=path to override palette in ACT format] {map ID}" << std::endl;
     return -1;
   }
 
   Magick::InitializeMagick(nullptr);
 
+  int mapArgStart = 2;
+
+  bool shouldOverridePalette = false;
+  std::vector<Palette> overridePalettes;
+  if (std::string(argv[2]).substr(0, 10) == "--palette=") {
+    mapArgStart++;
+    shouldOverridePalette = true;
+
+    std::string filename = std::string(argv[2]).substr(10);
+    std::ifstream palfile(filename, std::ios::binary);
+    if (!palfile.is_open()) {
+      throw std::invalid_argument("Could not find palette file: " + filename);
+    }
+
+    palfile.seekg(0, palfile.end);
+    int length = palfile.tellg();
+    palfile.seekg(0, palfile.beg);
+    std::vector<char> paletteData(length, 0);
+    palfile.read(paletteData.data(), length);
+
+    BufferView palbuf(paletteData);
+    for (int i=0; i<12; i++) {
+      std::vector<Magick::Color> colors;
+
+      for (int j=0; j<16; j++) {
+        unsigned char r = palbuf.ReadNextByte();
+        unsigned char g = palbuf.ReadNextByte();
+        unsigned char b = palbuf.ReadNextByte();
+        colors.push_back(Magick::ColorRGB(r/256.0, g/256.0, b/256.0));
+      }
+
+      overridePalettes.emplace_back(std::move(colors));
+    }
+  }
+
   Rom m3(argv[1]);
   auto roomInfos = RoomInfo::ReadFromRom(m3.buffer());
   auto roomGfxPals = RoomGfxPal::ReadFromRom(m3.buffer());
 
   std::list<Map> maps;
-  for (int i=2; i<argc; i++) {
+  for (int i=mapArgStart; i<argc; i++) {
     int roomNum = std::stoi(argv[i]);
-    maps.emplace_back(m3.buffer(), roomNum, roomInfos[roomNum], roomGfxPals[roomNum]);
+    RoomGfxPal& roomGfxPal = roomGfxPals[roomNum];
+
+    maps.emplace_back(
+      m3.buffer(),
+      roomNum,
+      roomInfos[roomNum],
+      shouldOverridePalette ? overridePalettes : roomGfxPal.GetPalettes(m3.buffer()),
+      roomGfxPal.GetTilesets(m3.buffer()));
   }
 
   globaltile_identifier globaltiles;