From 532c0c257233f139ffc05f3b093220c1f6a8372f Mon Sep 17 00:00:00 2001
From: Justin Scofield <justin.scofield@outlook.com>
Date: Tue, 19 Jul 2022 15:48:45 +0000
Subject: [PATCH] refactor overworld_map

---
 src/app/zelda3/overworld_map.cc | 30 ++++++++++--------------------
 src/app/zelda3/overworld_map.h  |  9 ---------
 2 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/src/app/zelda3/overworld_map.cc b/src/app/zelda3/overworld_map.cc
index 55e3a829..39e5ea1b 100644
--- a/src/app/zelda3/overworld_map.cc
+++ b/src/app/zelda3/overworld_map.cc
@@ -26,14 +26,11 @@ OverworldMap::OverworldMap(ROM& rom, const std::vector<gfx::Tile16>& tiles16,
 
   if (index_ < 64) {
     sprite_graphics_[0] = rom_.data()[core::overworldSpriteset + parent_];
-    sprite_graphics_[1] =
-        rom_.data()[core::overworldSpriteset + parent_ + 64];
-    sprite_graphics_[2] =
-        rom_.data()[core::overworldSpriteset + parent_ + 128];
+    sprite_graphics_[1] = rom_.data()[core::overworldSpriteset + parent_ + 64];
+    sprite_graphics_[2] = rom_.data()[core::overworldSpriteset + parent_ + 128];
     gfx_ = rom_.data()[core::mapGfx + parent_];
     palette_ = rom_.data()[core::overworldMapPalette + parent_];
-    sprite_palette_[0] =
-        rom_.data()[core::overworldSpritePalette + parent_];
+    sprite_palette_[0] = rom_.data()[core::overworldSpritePalette + parent_];
     sprite_palette_[1] =
         rom_.data()[core::overworldSpritePalette + parent_ + 64];
     sprite_palette_[2] =
@@ -43,12 +40,9 @@ OverworldMap::OverworldMap(ROM& rom, const std::vector<gfx::Tile16>& tiles16,
     musics[2] = rom_.data()[core::overworldMusicMasterSword + parent_];
     musics[3] = rom_.data()[core::overworldMusicAgahim + parent_];
   } else if (index_ < 128) {
-    sprite_graphics_[0] =
-        rom_.data()[core::overworldSpriteset + parent_ + 128];
-    sprite_graphics_[1] =
-        rom_.data()[core::overworldSpriteset + parent_ + 128];
-    sprite_graphics_[2] =
-        rom_.data()[core::overworldSpriteset + parent_ + 128];
+    sprite_graphics_[0] = rom_.data()[core::overworldSpriteset + parent_ + 128];
+    sprite_graphics_[1] = rom_.data()[core::overworldSpriteset + parent_ + 128];
+    sprite_graphics_[2] = rom_.data()[core::overworldSpriteset + parent_ + 128];
     gfx_ = rom_.data()[core::mapGfx + parent_];
     palette_ = rom_.data()[core::overworldMapPalette + parent_];
     sprite_palette_[0] =
@@ -84,12 +78,9 @@ OverworldMap::OverworldMap(ROM& rom, const std::vector<gfx::Tile16>& tiles16,
 
     message_id_ = rom_.data()[core::overworldMessages + parent_];
 
-    sprite_graphics_[0] =
-        rom_.data()[core::overworldSpriteset + parent_ + 128];
-    sprite_graphics_[1] =
-        rom_.data()[core::overworldSpriteset + parent_ + 128];
-    sprite_graphics_[2] =
-        rom_.data()[core::overworldSpriteset + parent_ + 128];
+    sprite_graphics_[0] = rom_.data()[core::overworldSpriteset + parent_ + 128];
+    sprite_graphics_[1] = rom_.data()[core::overworldSpriteset + parent_ + 128];
+    sprite_graphics_[2] = rom_.data()[core::overworldSpriteset + parent_ + 128];
     sprite_palette_[0] =
         rom_.data()[core::overworldSpritePalette + parent_ + 128];
     sprite_palette_[1] =
@@ -119,8 +110,7 @@ void OverworldMap::BuildMap(int count, int game_state, uchar* map_parent,
 
     if (parent_ != index_ && !initialized_) {
       if (index_ >= 0x80 && index_ <= 0x8A && index_ != 0x88) {
-        gfx_ = rom_.data()[core::overworldSpecialGFXGroup +
-                           (parent_ - 128)];
+        gfx_ = rom_.data()[core::overworldSpecialGFXGroup + (parent_ - 128)];
         palette_ = rom_.data()[core::overworldSpecialPALGroup + 1];
       } else if (index_ == 0x88) {
         gfx_ = 81;
diff --git a/src/app/zelda3/overworld_map.h b/src/app/zelda3/overworld_map.h
index d925f6e0..4df83dd1 100644
--- a/src/app/zelda3/overworld_map.h
+++ b/src/app/zelda3/overworld_map.h
@@ -48,20 +48,11 @@ class OverworldMap {
 
  private:
   void BuildTiles16Gfx(int count);
-  // void ReloadPalettes() { LoadPalette(); }
-
   void CopyTile(int x, int y, int xx, int yy, int offset, gfx::TileInfo tile,
                 uchar* gfx16Pointer, uchar* gfx8Pointer);
   void CopyTileToMap(int x, int y, int xx, int yy, int offset,
                      gfx::TileInfo tile, uchar* gfx16Pointer,
                      uchar* gfx8Pointer);
-
-  void LoadPalette();
-
-  void SetColorsPalette(int index, ImVec4 main, ImVec4 animated, ImVec4 aux1,
-                        ImVec4 aux2, ImVec4 hud, ImVec4 bgrcolor, ImVec4 spr,
-                        ImVec4 spr2);
-
   void BuildTileset(int gameState);
 };