From 89c5dcfec67cee93297f990a60c7ef718533f115 Mon Sep 17 00:00:00 2001
From: Justin Scofield <justin.scofield@outlook.com>
Date: Mon, 20 Jun 2022 14:10:57 -0400
Subject: [PATCH] namespace housekeeping

---
 src/app/zelda3/overworld.cc     |  4 ++--
 src/app/zelda3/overworld.h      |  4 ++--
 src/app/zelda3/overworld_map.cc | 15 +++++++--------
 src/app/zelda3/overworld_map.h  | 13 ++++++-------
 4 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/app/zelda3/overworld.cc b/src/app/zelda3/overworld.cc
index 81214696..8a992e15 100644
--- a/src/app/zelda3/overworld.cc
+++ b/src/app/zelda3/overworld.cc
@@ -5,7 +5,7 @@
 
 namespace yaze {
 namespace app {
-namespace Data {
+namespace zelda3 {
 
 using namespace core;
 using namespace gfx;
@@ -343,6 +343,6 @@ void Overworld::LoadOverworldMap() {
   // owactualMapBitmap.Palette = cp;
 }
 
-}  // namespace Data
+}  // namespace zelda3
 }  // namespace app
 }  // namespace yaze
\ No newline at end of file
diff --git a/src/app/zelda3/overworld.h b/src/app/zelda3/overworld.h
index e112d6a1..2be8a410 100644
--- a/src/app/zelda3/overworld.h
+++ b/src/app/zelda3/overworld.h
@@ -14,7 +14,7 @@
 
 namespace yaze {
 namespace app {
-namespace Data {
+namespace zelda3 {
 
 class Overworld {
  public:
@@ -67,7 +67,7 @@ class Overworld {
   void LoadOverworldMap();
 };
 
-}  // namespace Data
+}  // namespace zelda3
 }  // namespace app
 }  // namespace yaze
 
diff --git a/src/app/zelda3/overworld_map.cc b/src/app/zelda3/overworld_map.cc
index 2076b784..aa349736 100644
--- a/src/app/zelda3/overworld_map.cc
+++ b/src/app/zelda3/overworld_map.cc
@@ -1,18 +1,17 @@
 #include "overworld_map.h"
 
-#include "rom.h"
 #include "gfx/tile.h"
+#include "rom.h"
 
 namespace yaze {
 namespace app {
-namespace Data {
+namespace zelda3 {
 
 using namespace core;
 using namespace gfx;
 
-OverworldMap::OverworldMap(Data::ROM & rom,
-                           const std::vector<gfx::Tile16> tiles16,
-                           uchar index)
+OverworldMap::OverworldMap(Data::ROM& rom,
+                           const std::vector<gfx::Tile16> tiles16, uchar index)
     : rom_(rom), index(index), tiles16_(tiles16), parent(index) {
   if (index != 0x80) {
     if (index <= 150) {
@@ -293,8 +292,8 @@ void OverworldMap::BuildTileset(int gameState) {
   for (int i = 0; i < 4; i++) {
     staticgfx[12 + i] =
         (uchar)(rom_.GetRawData()[constants::sprite_blockset_pointer +
-                                 (sprgfx[gameState] * 4) + i] +
-               115);
+                                  (sprgfx[gameState] * 4) + i] +
+                115);
   }
 
   // Main Blocksets
@@ -354,6 +353,6 @@ void OverworldMap::BuildTileset(int gameState) {
   }
 }
 
-}  // namespace Data
+}  // namespace zelda3
 }  // namespace app
 }  // namespace yaze
\ No newline at end of file
diff --git a/src/app/zelda3/overworld_map.h b/src/app/zelda3/overworld_map.h
index d363ccc2..ee9585fe 100644
--- a/src/app/zelda3/overworld_map.h
+++ b/src/app/zelda3/overworld_map.h
@@ -3,13 +3,13 @@
 #include <cstddef>
 #include <memory>
 
-#include "rom.h"
 #include "gfx/bitmap.h"
 #include "gfx/tile.h"
+#include "rom.h"
 
 namespace yaze {
 namespace app {
-namespace Data {
+namespace zelda3 {
 
 using ushort = unsigned short;
 
@@ -42,7 +42,7 @@ class OverworldMap {
   uchar* currentOWgfx16Ptr = new uchar[(128 * 512) / 2];
   std::vector<gfx::Tile16> tiles16_;
 
-  OverworldMap(Data::ROM & rom, const std::vector<gfx::Tile16> tiles16,
+  OverworldMap(Data::ROM& rom, const std::vector<gfx::Tile16> tiles16,
                uchar index);
   void BuildMap(uchar* mapParent, int count, int gameState,
                 ushort** allmapsTilesLW, ushort** allmapsTilesDW,
@@ -56,9 +56,8 @@ class OverworldMap {
   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 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);
@@ -72,6 +71,6 @@ class OverworldMap {
   void BuildTileset(int gameState);
 };
 
-}  // namespace Data
+}  // namespace zelda3
 }  // namespace app
 }  // namespace yaze
\ No newline at end of file