housekeeping

src/app/zelda3/overworld.cc

@@ -1,7 +1,7 @@
 #include "overworld.h"
 
-#include "gfx/tile.h"
-#include "rom.h"
+#include "app/gfx/tile.h"
+#include "app/rom.h"
 
 namespace yaze {
 namespace app {
@@ -41,7 +41,7 @@ static TileInfo GetTilesInfo(ushort tile) {
   return TileInfo(tid, p, v, h, o);
 }
 
-void Overworld::Load(ROM& rom) {
+void Overworld::Load(app::rom::ROM& rom) {
   rom_ = rom;
   for (int i = 0; i < 0x2B; i++) {
     tileLeftEntrance.push_back(constants::overworldEntranceAllowedTilesLeft +

src/app/zelda3/overworld.h

@@ -6,11 +6,11 @@
 #include <memory>
 #include <vector>
 
-#include "Core/constants.h"
-#include "gfx/bitmap.h"
-#include "gfx/tile.h"
-#include "overworld_map.h"
-#include "rom.h"
+#include "app/core/constants.h"
+#include "app/gfx/bitmap.h"
+#include "app/gfx/tile.h"
+#include "app/rom.h"
+#include "app/zelda3/overworld_map.h"
 
 namespace yaze {
 namespace app {
@@ -21,7 +21,7 @@ class Overworld {
   Overworld() = default;
   ~Overworld();
 
-  void Load(ROM& rom);
+  void Load(app::rom::ROM& rom);
 
   char* overworldMapPointer = new char[0x40000];
   gfx::Bitmap* overworldMapBitmap;
@@ -30,7 +30,7 @@ class Overworld {
   gfx::Bitmap* owactualMapBitmap;
 
  private:
-  ROM rom_;
+  app::rom::ROM rom_;
   int gameState = 1;
   bool isLoaded = false;
   uchar mapParent[160];

src/app/zelda3/overworld_map.cc

@@ -1,7 +1,11 @@
 #include "overworld_map.h"
 
-#include "gfx/tile.h"
-#include "rom.h"
+#include <cstddef>
+#include <memory>
+
+#include "app/gfx/bitmap.h"
+#include "app/gfx/tile.h"
+#include "app/rom.h"
 
 namespace yaze {
 namespace app {
@@ -10,7 +14,7 @@ namespace zelda3 {
 using namespace core;
 using namespace gfx;
 
-OverworldMap::OverworldMap(ROM& rom, const std::vector<gfx::Tile16> tiles16,
+OverworldMap::OverworldMap(app::rom::ROM& rom, const std::vector<gfx::Tile16> tiles16,
                            uchar index)
     : rom_(rom), index(index), tiles16_(tiles16), parent(index) {
   if (index != 0x80) {

src/app/zelda3/overworld_map.h

@@ -3,9 +3,9 @@
 #include <cstddef>
 #include <memory>
 
-#include "gfx/bitmap.h"
-#include "gfx/tile.h"
-#include "rom.h"
+#include "app/gfx/bitmap.h"
+#include "app/gfx/tile.h"
+#include "app/rom.h"
 
 namespace yaze {
 namespace app {
@@ -37,12 +37,12 @@ class OverworldMap {
   ushort** tilesUsed;
 
   bool needRefresh = false;
-  ROM rom_;
+  app::rom::ROM rom_;
 
   uchar* currentOWgfx16Ptr = new uchar[(128 * 512) / 2];
   std::vector<gfx::Tile16> tiles16_;
 
-  OverworldMap(ROM& rom, const std::vector<gfx::Tile16> tiles16, uchar index);
+  OverworldMap(app::rom::ROM& rom, const std::vector<gfx::Tile16> tiles16, uchar index);
   void BuildMap(uchar* mapParent, int count, int gameState,
                 ushort** allmapsTilesLW, ushort** allmapsTilesDW,
                 ushort** allmapsTilesSP);