From d2da16b47de8ec2b5d3d8ff2c90bf92128c11693 Mon Sep 17 00:00:00 2001
From: Justin Scofield <justin.scofield@outlook.com>
Date: Wed, 20 Jul 2022 21:40:18 -0400
Subject: [PATCH] housekeeping

---
 src/app/editor/overworld_editor.cc |  6 +++++-
 src/app/editor/overworld_editor.h  | 17 ++++++++---------
 src/app/rom.cc                     |  9 ++++-----
 src/app/zelda3/overworld.cc        |  6 ++----
 src/app/zelda3/overworld_map.cc    |  1 -
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/app/editor/overworld_editor.cc b/src/app/editor/overworld_editor.cc
index 9c0b1a72..36199cef 100644
--- a/src/app/editor/overworld_editor.cc
+++ b/src/app/editor/overworld_editor.cc
@@ -233,7 +233,11 @@ void OverworldEditor::DrawTileSelector() {
       ImGui::EndTabItem();
     }
     if (ImGui::BeginTabItem("Current Graphics")) {
-      DrawAreaGraphics();
+      if (ImGui::BeginChild("#Tile16Child", ImGui::GetContentRegionAvail(),
+                            true, ImGuiWindowFlags_NoScrollbar)) {
+        DrawAreaGraphics();
+      }
+      ImGui::EndChild();
       ImGui::EndTabItem();
     }
     ImGui::EndTabBar();
diff --git a/src/app/editor/overworld_editor.h b/src/app/editor/overworld_editor.h
index 8ef676af..6e86d815 100644
--- a/src/app/editor/overworld_editor.h
+++ b/src/app/editor/overworld_editor.h
@@ -54,7 +54,14 @@ class OverworldEditor {
   bool all_gfx_loaded_ = false;
   bool map_blockset_loaded_ = false;
 
-  std::unordered_map<unsigned int, SDL_Texture *> all_texture_sheet_;
+  ImVec4 current_palette_[8];
+
+  ImGuiTableFlags toolset_table_flags = ImGuiTableFlags_SizingFixedFit;
+  ImGuiTableFlags ow_map_flags = ImGuiTableFlags_Borders;
+  ImGuiTableFlags ow_edit_flags = ImGuiTableFlags_Reorderable |
+                                  ImGuiTableFlags_Resizable |
+                                  ImGuiTableFlags_SizingStretchSame;
+
   std::unordered_map<unsigned int, gfx::Bitmap> graphics_bin_;
 
   ROM rom_;
@@ -69,14 +76,6 @@ class OverworldEditor {
   gui::Canvas current_gfx_canvas_;
   gui::Canvas blockset_canvas_;
   gui::Canvas graphics_bin_canvas_;
-
-  ImVec4 current_palette_[8];
-
-  ImGuiTableFlags toolset_table_flags = ImGuiTableFlags_SizingFixedFit;
-  ImGuiTableFlags ow_map_flags = ImGuiTableFlags_Borders;
-  ImGuiTableFlags ow_edit_flags = ImGuiTableFlags_Reorderable |
-                                  ImGuiTableFlags_Resizable |
-                                  ImGuiTableFlags_SizingStretchSame;
 };
 }  // namespace editor
 }  // namespace app
diff --git a/src/app/rom.cc b/src/app/rom.cc
index 53d46a92..b1c8b5ac 100644
--- a/src/app/rom.cc
+++ b/src/app/rom.cc
@@ -76,17 +76,16 @@ void ROM::LoadAllGraphicsData() {
       data = Decompress(gfx_addr, core::UncompressedSheetSize);
     }
 
-    auto converted_sheet = SNES3bppTo8bppSheet(data);
     gfx::Bitmap tilesheet_bmp(core::kTilesheetWidth, core::kTilesheetHeight,
-                              core::kTilesheetDepth, converted_sheet);
+                              core::kTilesheetDepth, SNES3bppTo8bppSheet(data));
     tilesheet_bmp.CreateTexture(sdl_renderer_);
     graphics_bin_[i] = tilesheet_bmp;
 
-    for (int j = 0; j < sizeof(converted_sheet); j++) {
-      buffer[j + buffer_pos] = converted_sheet[j];
+    for (int j = 0; j < sizeof(data); j++) {
+      buffer[j + buffer_pos] = data[j];
     }
 
-    buffer_pos += sizeof(converted_sheet);
+    buffer_pos += sizeof(data);
   }
 
   master_gfx_bin_ = buffer;
diff --git a/src/app/zelda3/overworld.cc b/src/app/zelda3/overworld.cc
index 83a7fbf8..98f6fd72 100644
--- a/src/app/zelda3/overworld.cc
+++ b/src/app/zelda3/overworld.cc
@@ -14,16 +14,14 @@ void Overworld::Load(ROM &rom, uchar *ow_blockset, uchar *current_gfx) {
   AssembleMap16Tiles();
   DecompressAllMapTiles();
 
-  // Map Initialization
   for (int i = 0; i < core::NumberOfOWMaps; i++) {
     overworld_maps_.emplace_back(i, rom_, tiles16);
   }
   FetchLargeMaps();
 
-  auto size = tiles16.size();
   for (int i = 0; i < core::NumberOfOWMaps; i++) {
-    overworld_maps_[i].BuildMap(size, game_state_, map_parent_, ow_blockset,
-                                current_gfx, map_tiles_);
+    overworld_maps_[i].BuildMap(tiles16.size(), game_state_, map_parent_,
+                                ow_blockset, current_gfx, map_tiles_);
   }
 
   is_loaded_ = true;
diff --git a/src/app/zelda3/overworld_map.cc b/src/app/zelda3/overworld_map.cc
index 45697a1f..a306b155 100644
--- a/src/app/zelda3/overworld_map.cc
+++ b/src/app/zelda3/overworld_map.cc
@@ -207,7 +207,6 @@ void OverworldMap::BuildTileset(int game_state, uchar* current_gfx) {
   }
 
   auto all_gfx_data = rom_.GetMasterGraphicsBin();
-
   for (int i = 0; i < 16; i++) {
     for (int j = 0; j < 2048; j++) {
       uchar mapByte = all_gfx_data[j + (static_graphics_[i] * 2048)];