1 files changed, 68 insertions, 41 deletions

@@ -7,6 +7,7 @@
 #include <vector>
 #include <iostream>
 #include <Magick++.h>
+#include <sstream>
 
 class Rom {
 public:
@@ -270,46 +271,12 @@ struct SpriteSheet {
   int gfxPtr;
   std::vector<Sprite> sprites;
 
-  Magick::Image render(Rom& m3, PaletteSet& palettes) const {
-    int maxWidth = 0;
-    int maxHeight = 0;
-    std::vector<FrameOutput> frames;
-
+  void render(Rom& m3, PaletteSet& palettes, std::vector<FrameOutput>& frames) const {
     const Palette& palette = palettes.GetPalette(spriteindex);
     for (int i=0; i<sprites.size(); i++) {
       FrameOutput f = sprites[i].render(m3, palette, gfxPtr);
-
-      if (f.width > maxWidth) maxWidth = f.width;
-      if (f.height > maxHeight) maxHeight = f.height;
       frames.push_back(std::move(f));
     }
-
-    const int FRAMES_PER_ROW = 10;
-    int sheetWidth;
-    int sheetHeight;
-
-    std::ofstream datafile("out.txt");
-    datafile << maxWidth << "," << maxHeight << " cell size" << std::endl;
-    datafile << FRAMES_PER_ROW << " frames per row" << std::endl;
-    datafile << frames.size() << " frames" << std::endl;
-    datafile << std::endl;
-
-    if (frames.size() < FRAMES_PER_ROW) {
-      sheetWidth = frames.size() * maxWidth;
-      sheetHeight = maxHeight;
-    } else {
-      sheetWidth = FRAMES_PER_ROW * maxWidth;
-      sheetHeight = (frames.size() / FRAMES_PER_ROW + 1) * maxHeight;
-    }
-
-    Magick::Image sheet(Magick::Geometry(sheetWidth, sheetHeight), "transparent");
-    for (int i=0; i<frames.size(); i++) {
-      const FrameOutput& f = frames.at(i);
-      sheet.composite(f.image, (i%FRAMES_PER_ROW)*maxWidth, (i/FRAMES_PER_ROW)*maxHeight, Magick::OverCompositeOp);
-      datafile << f.width << "," << f.height << "," << f.centerX << "," << f.centerY << std::endl;
-    }
-
-    return sheet;
   }
 };
 
@@ -388,8 +355,10 @@ private:
 };
 
 int main(int argc, char** argv) {
-  if (argc != 2) {
-    std::cout << "Usage" << std::endl;
+  if (argc < 3) {
+    std::cout << "Usage: ./sprite_dumper [path to rom] {sheet IDs}" << std::endl;
+    std::cout << "sheet IDs should be space separated references to the sheets to concatenate" << std::endl;
+    std::cout << "the format of the ID is BankNum.SheetNum" << std::endl;
     return -1;
   }
 
@@ -397,14 +366,72 @@ int main(int argc, char** argv) {
 
   Rom m3(argv[1]);
   PaletteSet palettes(m3);
-  //const int banks[] = {0x1A442A4, 0x1AE0638, 0x1AEE4C4, 0x1AF1ED0};
   Bank b1(m3, 0x1A442A4, 0x14383E4);
   Bank b2(m3, 0x1AE0638, 0x194BC30);
   Bank b3(m3, 0x1AEE4C4, 0x1A012B8);
   Bank b4(m3, 0x1AF1ED0, 0x1A36AA0);
-  Magick::Image im = b2.SpriteSheets().at(3).render(m3, palettes);
-  im.magick("png");
-  im.write("out.png");
+
+  std::vector<FrameOutput> frames;
+
+  for (int i=2; i<argc; i++) {
+    std::stringstream argfmt;
+    argfmt << argv[i];
+
+    int bankNum;
+    char ch;
+    int sheetNum;
+    argfmt >> bankNum;
+    argfmt >> ch; //.
+    argfmt >> sheetNum;
+
+    const Bank& bankToRead = [&](){
+      switch (bankNum) {
+        case 0: return b1;
+        case 1: return b2;
+        case 2: return b3;
+        case 3: return b4;
+        default: throw std::invalid_argument("Invalid bank num: " + std::to_string(bankNum));
+      }
+    }();
+
+    bankToRead.SpriteSheets().at(sheetNum).render(m3, palettes, frames);
+  }
+
+  int maxWidth = 0;
+  int maxHeight = 0;
+  for (const FrameOutput& f : frames) {
+    if (f.width > maxWidth) maxWidth = f.width;
+    if (f.height > maxHeight) maxHeight = f.height;
+  }
+
+  const int FRAMES_PER_ROW = 10;
+  int sheetWidth;
+  int sheetHeight;
+
+  std::ofstream datafile("out.txt");
+  datafile << maxWidth << "," << maxHeight << " cell size" << std::endl;
+  datafile << FRAMES_PER_ROW << " frames per row" << std::endl;
+  datafile << frames.size() << " frames" << std::endl;
+  datafile << std::endl;
+
+  if (frames.size() < FRAMES_PER_ROW) {
+    sheetWidth = frames.size() * maxWidth;
+    sheetHeight = maxHeight;
+  } else {
+    sheetWidth = FRAMES_PER_ROW * maxWidth;
+    sheetHeight = (frames.size() / FRAMES_PER_ROW + 1) * maxHeight;
+  }
+
+  Magick::Image sheet(Magick::Geometry(sheetWidth, sheetHeight), "transparent");
+  for (int i=0; i<frames.size(); i++) {
+    const FrameOutput& f = frames.at(i);
+    sheet.composite(f.image, (i%FRAMES_PER_ROW)*maxWidth, (i/FRAMES_PER_ROW)*maxHeight, Magick::OverCompositeOp);
+    datafile << f.width << "," << f.height << "," << f.centerX << "," << f.centerY << std::endl;
+  }
+
+  //Magick::Image im = b2.SpriteSheets().at(3).render(m3, palettes);
+  sheet.magick("png");
+  sheet.write("out.png");
 
   return 0;
 }
\ No newline at end of file