From e15cca2e84493aa1405a156efd2e180283e09fa5 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Tue, 23 Aug 2022 13:26:42 -0500
Subject: [PATCH] rom housekeeping

---
 src/app/rom.cc | 6 +++---
 src/app/rom.h  | 9 +--------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/app/rom.cc b/src/app/rom.cc
index b7f5e935..2fdd6ff0 100644
--- a/src/app/rom.cc
+++ b/src/app/rom.cc
@@ -541,7 +541,7 @@ absl::StatusOr<Bytes> ROM::Decompress(int offset, int size, bool reversed) {
         offset += 2;  // Advance 2 byte in the ROM
       } break;
       case kCommandIncreasingFill: {
-        uchar inc_byte = rom_data_[offset];
+        auto inc_byte = rom_data_[offset];
         for (int i = 0; i < length; i++) {
           buffer[buffer_pos] = inc_byte++;
           buffer_pos++;
@@ -576,8 +576,8 @@ absl::StatusOr<Bytes> ROM::Decompress(int offset, int size, bool reversed) {
       } break;
       default: {
         std::cout << absl::StrFormat(
-            "DecompressOverworld: Invalid command in header for "
-            "decompression (Offset : %#06x, Command: %#04x)\n",
+            "DecompressGraphics: Invalid command in header (Offset : %#06x, "
+            "Command: %#04x)\n",
             offset, command);
       } break;
     }
diff --git a/src/app/rom.h b/src/app/rom.h
index 7f940409..b2f986c3 100644
--- a/src/app/rom.h
+++ b/src/app/rom.h
@@ -57,14 +57,6 @@ struct CompressionPiece {
 };
 using CompressionPiece = struct CompressionPiece;
 
-using OWBlockset = std::vector<std::vector<ushort>>;
-struct OWMapTiles {
-  OWBlockset light_world;    // 64 maps
-  OWBlockset dark_world;     // 64 maps
-  OWBlockset special_world;  // 32 maps
-};
-using OWMapTiles = struct OWMapTiles;
-
 class ROM {
  public:
   absl::StatusOr<Bytes> Compress(const int start, const int length,
@@ -118,6 +110,7 @@ class ROM {
   std::string filename_;
 
   Bytes rom_data_;
+  Bytes master_graphics_bin_;
   std::shared_ptr<SDL_Renderer> renderer_;
   absl::flat_hash_map<int, gfx::Bitmap> graphics_bin_;
 };