From b4543fbfa27df4484e9a7e70d36aa80b5c3c116a Mon Sep 17 00:00:00 2001
From: Justin Scofield <justin.scofield@outlook.com>
Date: Tue, 19 Jul 2022 19:24:10 +0000
Subject: [PATCH] OverworldEditor housekeeping

---
 src/app/editor/overworld_editor.cc |  6 ++--
 src/app/editor/overworld_editor.h  | 44 ++++++++++++------------------
 2 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/src/app/editor/overworld_editor.cc b/src/app/editor/overworld_editor.cc
index d4470d2c..4d42fed1 100644
--- a/src/app/editor/overworld_editor.cc
+++ b/src/app/editor/overworld_editor.cc
@@ -257,10 +257,10 @@ void OverworldEditor::DrawTile16Selector() const {
 
   if (map_blockset_loaded_) {
     draw_list->AddImage(
-        (void *)mapblockset16Bitmap.GetTexture(),
+        (void *)tile16_blockset_bmp_.GetTexture(),
         ImVec2(canvas_p0.x + 2, canvas_p0.y + 2),
-        ImVec2(canvas_p0.x + (mapblockset16Bitmap.GetWidth() * 2),
-               canvas_p0.y + (mapblockset16Bitmap.GetHeight() * 2)));
+        ImVec2(canvas_p0.x + (tile16_blockset_bmp_.GetWidth() * 2),
+               canvas_p0.y + (tile16_blockset_bmp_.GetHeight() * 2)));
   }
 
   // Draw grid + all lines in the canvas
diff --git a/src/app/editor/overworld_editor.h b/src/app/editor/overworld_editor.h
index c91db920..cdb110a5 100644
--- a/src/app/editor/overworld_editor.h
+++ b/src/app/editor/overworld_editor.h
@@ -18,6 +18,11 @@ namespace app {
 namespace editor {
 
 static constexpr unsigned int k4BPP = 4;
+static constexpr unsigned int kByteSize = 3;
+static constexpr unsigned int kMessageIdSize = 5;
+static constexpr unsigned int kNumSheetsToLoad = 223;
+static constexpr unsigned int kTile8DisplayHeight = 64;
+static constexpr float kInputFieldSize = 30.f;
 
 class OverworldEditor {
  public:
@@ -36,27 +41,6 @@ class OverworldEditor {
   void LoadBlockset();
   void LoadGraphics();
 
-  ROM rom_;
-
-  zelda3::Overworld overworld_;
-  gfx::SNESPalette palette_;
-  gui::Canvas overworld_map_canvas_;
-  gui::Canvas pseudo_vram_canvas_;
-
-  // pointer size 1048576
-  gfx::Bitmap tile16_blockset_bmp_;
-
-  // pointer size 32768
-  gfx::Bitmap current_gfx_bmp_;
-
-  // pointer size 456704
-  gfx::Bitmap allgfxBitmap;
-
-  gfx::Bitmap mapblockset16Bitmap;
-
-  std::unordered_map<unsigned int, SDL_Texture *> all_texture_sheet_;
-  std::unordered_map<unsigned int, gfx::Bitmap> graphics_bin_;
-
   int current_world_ = 0;
   char map_gfx_[3] = "";
   char map_palette_[3] = "";
@@ -71,11 +55,19 @@ class OverworldEditor {
   bool map_blockset_loaded_ = false;
   bool vram_loaded_ = false;
 
-  constexpr static int kByteSize = 3;
-  constexpr static int kMessageIdSize = 5;
-  constexpr static int kNumSheetsToLoad = 223;
-  constexpr static int kTile8DisplayHeight = 64;
-  constexpr static float kInputFieldSize = 30.f;
+  std::unordered_map<unsigned int, SDL_Texture *> all_texture_sheet_;
+  std::unordered_map<unsigned int, gfx::Bitmap> graphics_bin_;
+
+  ROM rom_;
+  zelda3::Overworld overworld_;
+
+  gfx::SNESPalette palette_;
+  gfx::Bitmap tile16_blockset_bmp_;  // pointer size 1048576
+  gfx::Bitmap current_gfx_bmp_;      // pointer size 32768
+  gfx::Bitmap all_gfx_bmp;           // pointer size 456704
+
+  gui::Canvas overworld_map_canvas_;
+  gui::Canvas pseudo_vram_canvas_;
 
   ImVec4 current_palette_[8];