housekeeping

src/gui/editor/editor.cc

@@ -6,13 +6,13 @@
 #include <imgui/imgui_memory_editor.h>
 #include <imgui/misc/cpp/imgui_stdlib.h>
 
-#include "core/constants.h"
-#include "gfx/palette.h"
-#include "gfx/tile.h"
+#include "app/core/constants.h"
+#include "app/gfx/snes_palette.h"
+#include "app/gfx/tile.h"
+#include "app/rom.h"
 #include "gui/editor/overworld_editor.h"
 #include "gui/icons.h"
 #include "gui/input.h"
-#include "rom.h"
 
 namespace yaze {
 namespace gui {
@@ -518,6 +518,6 @@ void Editor::DrawHUDEditor() {
   }
 }
 
-}  // namespace Editor
-}  // namespace app
+}  // namespace editor
+}  // namespace gui
 }  // namespace yaze

src/gui/editor/editor.h

@@ -7,12 +7,12 @@
 #include <imgui/imgui_memory_editor.h>
 #include <imgui/misc/cpp/imgui_stdlib.h>
 
-#include "core/constants.h"
-#include "gfx/tile.h"
+#include "app/core/constants.h"
+#include "app/gfx/tile.h"
+#include "app/rom.h"
 #include "gui/editor/overworld_editor.h"
 #include "gui/icons.h"
 #include "gui/input.h"
-#include "rom.h"
 
 namespace yaze {
 namespace gui {
@@ -45,7 +45,7 @@ class Editor {
   void *rom_data_;
   bool is_loaded_ = true;
 
-  app::ROM rom_;
+  app::rom::ROM rom_;
   TextEditor asm_editor_;
   TextEditor::LanguageDefinition language_65816_;
   OverworldEditor overworld_editor_;
@@ -66,7 +66,7 @@ class Editor {
 };
 
 }  // namespace editor
-}  // namespace app
+}  // namespace gui
 }  // namespace yaze
 
 #endif  // YAZE_APP_VIEW_EDITOR_H

src/gui/editor/overworld_editor.cc

@@ -4,11 +4,12 @@
 
 #include <cmath>
 
-#include "gfx/bitmap.h"
-#include "gfx/tile.h"
+#include "app/gfx/bitmap.h"
+#include "app/gfx/snes_palette.h"
+#include "app/gfx/tile.h"
+#include "app/zelda3/overworld.h"
 #include "gui/icons.h"
 
-
 // first step would be to decompress all gfx data from the game
 // (in alttp that's easy they're all located in the same location all the
 // same sheet size 128x32) have a code that convert PC address to SNES and
@@ -31,7 +32,7 @@ namespace yaze {
 namespace gui {
 namespace editor {
 
-void OverworldEditor::SetupROM(app::ROM &rom) { rom_ = rom; }
+void OverworldEditor::SetupROM(app::rom::ROM &rom) { rom_ = rom; }
 
 void OverworldEditor::Update() {
   if (rom_.isLoaded()) {
@@ -377,6 +378,6 @@ void OverworldEditor::Loadgfx() {
   }
 }
 
-}  // namespace Editor
-}  // namespace app
+}  // namespace editor
+}  // namespace gui
 }  // namespace yaze

src/gui/editor/overworld_editor.h

@@ -1,12 +1,13 @@
 #ifndef YAZE_APP_EDITOR_OVERWORLDEDITOR_H
 #define YAZE_APP_EDITOR_OVERWORLDEDITOR_H
 
-#include <imgui/imgui.h>
+#include <imgui.h>
 
-#include "gfx/palette.h"
-#include "gfx/tile.h"
+#include "app/gfx/bitmap.h"
+#include "app/gfx/snes_palette.h"
+#include "app/gfx/tile.h"
+#include "app/zelda3/overworld.h"
 #include "gui/icons.h"
-#include "zelda3/overworld.h"
 
 namespace yaze {
 namespace gui {
@@ -16,7 +17,7 @@ static constexpr unsigned int k4BPP = 4;
 
 class OverworldEditor {
  public:
-  void SetupROM(app::ROM &rom);
+  void SetupROM(app::rom::ROM &rom);
   void Update();
 
  private:
@@ -29,7 +30,7 @@ class OverworldEditor {
 
   void Loadgfx();
 
-  app::ROM rom_;
+  app::rom::ROM rom_;
   app::zelda3::Overworld overworld_;
   app::gfx::Bitmap allgfxBitmap;
   app::gfx::SNESPalette palette_;