move zelda3 directory to src from app

docs/C2-testing-without-roms.md

@@ -174,7 +174,7 @@ Mock ROM includes all these labels from `zelda3::Zelda3Labels`:
 | Music Tracks | 64+ | "Title Theme", "Overworld", "Dark World" |
 | Graphics Sheets | 128+ | "Link Sprites", "Enemy Pack 1" |
 
-See `src/app/zelda3/zelda3_labels.h` for the complete list.
+See `src/zelda3/zelda3_labels.h` for the complete list.
 
 ## Troubleshooting
 

scripts/build_cleaner.py

@@ -71,8 +71,8 @@ CONFIG: Sequence[CMakeSourceBlock] = (
     ),
     CMakeSourceBlock(
         variable="YAZE_APP_ZELDA3_SRC",
-        cmake_path=SOURCE_ROOT / "app/zelda3/zelda3_library.cmake",
-        directories=(DirectorySpec(SOURCE_ROOT / "app/zelda3"),),
+        cmake_path=SOURCE_ROOT / "zelda3/zelda3_library.cmake",
+        directories=(DirectorySpec(SOURCE_ROOT / "zelda3"),),
     ),
     CMakeSourceBlock(
         variable="YAZE_NET_SRC",

src/CMakeLists.txt

@@ -61,7 +61,7 @@ include(util/util.cmake)
 include(app/gfx/gfx_library.cmake)
 include(app/net/net_library.cmake)
 include(app/gui/gui_library.cmake)
-include(app/zelda3/zelda3_library.cmake)
+include(zelda3/zelda3_library.cmake)
 include(app/core/core_library.cmake)
 
 # Include test support library BEFORE yaze_editor so it can link against it

src/app/core/project.cc

@@ -13,7 +13,7 @@
 #include "util/platform_paths.h"
 #include "app/gui/icons.h"
 #include "util/log.h"
-#include "app/zelda3/zelda3_labels.h"
+#include "zelda3/zelda3_labels.h"
 #include "imgui/imgui.h"
 #include "yaze_config.h"
 

src/app/editor/dungeon/dungeon_canvas_viewer.cc

@@ -5,8 +5,8 @@
 #include "app/gfx/snes_palette.h"
 #include "app/gui/input.h"
 #include "app/rom.h"
-#include "app/zelda3/dungeon/room.h"
-#include "app/zelda3/sprite/sprite.h"
+#include "zelda3/dungeon/room.h"
+#include "zelda3/sprite/sprite.h"
 #include "imgui/imgui.h"
 #include "util/log.h"
 

src/app/editor/dungeon/dungeon_canvas_viewer.h

@@ -5,7 +5,7 @@
 
 #include "app/gui/canvas.h"
 #include "app/rom.h"
-#include "app/zelda3/dungeon/room.h"
+#include "zelda3/dungeon/room.h"
 #include "app/gfx/snes_palette.h"
 #include "dungeon_object_interaction.h"
 #include "imgui/imgui.h"

src/app/editor/dungeon/dungeon_editor_v2.cc

@@ -6,7 +6,7 @@
 #include "absl/strings/str_format.h"
 #include "app/gfx/arena.h"
 #include "app/gfx/snes_palette.h"
-#include "app/zelda3/dungeon/room.h"
+#include "zelda3/dungeon/room.h"
 #include "app/gui/icons.h"
 #include "app/gui/input.h"
 #include "imgui/imgui.h"

src/app/editor/dungeon/dungeon_editor_v2.h

@@ -15,8 +15,8 @@
 #include "dungeon_room_loader.h"
 #include "object_editor_card.h"
 #include "app/gui/editor_card_manager.h"
-#include "app/zelda3/dungeon/room.h"
-#include "app/zelda3/dungeon/room_entrance.h"
+#include "zelda3/dungeon/room.h"
+#include "zelda3/dungeon/room_entrance.h"
 #include "app/gui/editor_layout.h"
 #include "app/gui/widgets/dungeon_object_emulator_preview.h"
 #include "app/gui/widgets/palette_editor_widget.h"

src/app/editor/dungeon/dungeon_object_interaction.h

@@ -6,8 +6,8 @@
 
 #include "imgui/imgui.h"
 #include "app/gui/canvas.h"
-#include "app/zelda3/dungeon/room.h"
-#include "app/zelda3/dungeon/room_object.h"
+#include "zelda3/dungeon/room.h"
+#include "zelda3/dungeon/room_object.h"
 
 namespace yaze {
 namespace editor {

src/app/editor/dungeon/dungeon_object_selector.cc

@@ -10,9 +10,9 @@
 #include "app/gui/canvas.h"
 #include "app/gui/modules/asset_browser.h"
 #include "app/rom.h"
-#include "app/zelda3/dungeon/room.h"
-#include "app/zelda3/dungeon/dungeon_editor_system.h"
-#include "app/zelda3/dungeon/dungeon_object_editor.h"
+#include "zelda3/dungeon/room.h"
+#include "zelda3/dungeon/dungeon_editor_system.h"
+#include "zelda3/dungeon/dungeon_object_editor.h"
 #include "imgui/imgui.h"
 
 namespace yaze::editor {

src/app/editor/dungeon/dungeon_object_selector.h

@@ -4,8 +4,8 @@
 #include "app/gui/canvas.h"
 #include "app/rom.h"
 // object_renderer.h removed - using ObjectDrawer for production rendering
-#include "app/zelda3/dungeon/dungeon_object_editor.h"
-#include "app/zelda3/dungeon/dungeon_editor_system.h"
+#include "zelda3/dungeon/dungeon_object_editor.h"
+#include "zelda3/dungeon/dungeon_editor_system.h"
 #include "app/gfx/snes_palette.h"
 #include "imgui/imgui.h"
 

src/app/editor/dungeon/dungeon_room_loader.cc

@@ -8,7 +8,7 @@
 
 #include "app/gfx/performance/performance_profiler.h"
 #include "app/gfx/snes_palette.h"
-#include "app/zelda3/dungeon/room.h"
+#include "zelda3/dungeon/room.h"
 #include "util/log.h"
 
 namespace yaze::editor {

src/app/editor/dungeon/dungeon_room_loader.h

@@ -6,8 +6,8 @@
 
 #include "absl/status/status.h"
 #include "app/rom.h"
-#include "app/zelda3/dungeon/room.h"
-#include "app/zelda3/dungeon/room_entrance.h"
+#include "zelda3/dungeon/room.h"
+#include "zelda3/dungeon/room_entrance.h"
 
 namespace yaze {
 namespace editor {

src/app/editor/dungeon/dungeon_room_selector.cc

@@ -1,8 +1,8 @@
 #include "dungeon_room_selector.h"
 
 #include "app/gui/input.h"
-#include "app/zelda3/dungeon/room.h"
-#include "app/zelda3/dungeon/room_entrance.h"
+#include "zelda3/dungeon/room.h"
+#include "zelda3/dungeon/room_entrance.h"
 #include "imgui/imgui.h"
 #include "util/hex.h"
 

src/app/editor/dungeon/dungeon_room_selector.h

@@ -4,8 +4,8 @@
 #include <functional>
 #include "imgui/imgui.h"
 #include "app/rom.h"
-#include "app/zelda3/dungeon/room_entrance.h"
-#include "app/zelda3/dungeon/room.h"
+#include "zelda3/dungeon/room_entrance.h"
+#include "zelda3/dungeon/room.h"
 
 namespace yaze {
 namespace editor {

src/app/editor/dungeon/dungeon_usage_tracker.h

@@ -2,7 +2,7 @@
 #define YAZE_APP_EDITOR_DUNGEON_DUNGEON_USAGE_TRACKER_H
 
 #include "absl/container/flat_hash_map.h"
-#include "app/zelda3/dungeon/room.h"
+#include "zelda3/dungeon/room.h"
 
 namespace yaze {
 namespace editor {

src/app/editor/dungeon/object_editor_card.h

@@ -11,7 +11,7 @@
 #include "app/gui/editor_layout.h"
 #include "app/gui/widgets/dungeon_object_emulator_preview.h"
 #include "app/rom.h"
-#include "app/zelda3/dungeon/room_object.h"
+#include "zelda3/dungeon/room_object.h"
 
 namespace yaze {
 namespace editor {

src/app/editor/editor_manager.cc

@@ -37,7 +37,7 @@
 #include "app/gui/theme_manager.h"
 #include "app/rom.h"
 #include "app/test/test_manager.h"
-#include "app/zelda3/overworld/overworld_map.h"
+#include "zelda3/overworld/overworld_map.h"
 #ifdef YAZE_ENABLE_TESTING
 #include "app/test/e2e_test_suite.h"
 #include "app/test/integrated_test_suite.h"

src/app/editor/graphics/graphics_editor.h

@@ -13,7 +13,7 @@
 #include "app/gui/editor_layout.h"
 #include "app/gui/modules/asset_browser.h"
 #include "app/rom.h"
-#include "app/zelda3/overworld/overworld.h"
+#include "zelda3/overworld/overworld.h"
 #include "imgui/imgui.h"
 #include "imgui_memory_editor.h"
 

src/app/editor/graphics/screen_editor.h

@@ -11,8 +11,8 @@
 #include "app/gfx/tilemap.h"
 #include "app/gui/canvas.h"
 #include "app/rom.h"
-#include "app/zelda3/screen/dungeon_map.h"
-#include "app/zelda3/screen/inventory.h"
+#include "zelda3/screen/dungeon_map.h"
+#include "zelda3/screen/inventory.h"
 #include "app/gui/editor_layout.h"
 #include "imgui/imgui.h"
 

src/app/editor/music/music_editor.h

@@ -7,7 +7,7 @@
 #include "app/gui/editor_card_manager.h"
 #include "app/gui/editor_layout.h"
 #include "app/rom.h"
-#include "app/zelda3/music/tracker.h"
+#include "zelda3/music/tracker.h"
 #include "imgui/imgui.h"
 
 namespace yaze {

src/app/editor/overworld/entity.h

@@ -1,11 +1,11 @@
 #ifndef YAZE_APP_EDITOR_OVERWORLD_ENTITY_H
 #define YAZE_APP_EDITOR_OVERWORLD_ENTITY_H
 
-#include "app/zelda3/common.h"
-#include "app/zelda3/overworld/overworld_entrance.h"
-#include "app/zelda3/overworld/overworld_exit.h"
-#include "app/zelda3/overworld/overworld_item.h"
-#include "app/zelda3/sprite/sprite.h"
+#include "zelda3/common.h"
+#include "zelda3/overworld/overworld_entrance.h"
+#include "zelda3/overworld/overworld_exit.h"
+#include "zelda3/overworld/overworld_item.h"
+#include "zelda3/sprite/sprite.h"
 #include "imgui/imgui.h"
 
 namespace yaze {

src/app/editor/overworld/map_properties.cc

@@ -7,7 +7,7 @@
 #include "app/gui/color.h"
 #include "app/gui/icons.h"
 #include "app/gui/input.h"
-#include "app/zelda3/overworld/overworld_map.h"
+#include "zelda3/overworld/overworld_map.h"
 #include "imgui/imgui.h"
 
 namespace yaze {

src/app/editor/overworld/map_properties.h

@@ -3,7 +3,7 @@
 
 #include <functional>
 
-#include "app/zelda3/overworld/overworld.h"
+#include "zelda3/overworld/overworld.h"
 #include "app/rom.h"
 #include "app/gui/canvas.h"
 

src/app/editor/overworld/overworld_editor.cc

@@ -31,9 +31,9 @@
 #include "app/gui/style.h"
 #include "app/gui/ui_helpers.h"
 #include "app/rom.h"
-#include "app/zelda3/common.h"
-#include "app/zelda3/overworld/overworld.h"
-#include "app/zelda3/overworld/overworld_map.h"
+#include "zelda3/common.h"
+#include "zelda3/overworld/overworld.h"
+#include "zelda3/overworld/overworld_map.h"
 #include "imgui/imgui.h"
 #include "imgui_memory_editor.h"
 #include "util/file_util.h"

src/app/editor/overworld/overworld_editor.h

@@ -16,7 +16,7 @@
 #include "app/gui/widgets/tile_selector_widget.h"
 #include "app/gui/input.h"
 #include "app/rom.h"
-#include "app/zelda3/overworld/overworld.h"
+#include "zelda3/overworld/overworld.h"
 #include "imgui/imgui.h"
 #include <mutex>
 

src/app/editor/overworld/overworld_entity_renderer.cc

@@ -4,7 +4,7 @@
 #include "app/core/features.h"
 #include "app/editor/overworld/entity.h"
 #include "app/gui/canvas.h"
-#include "app/zelda3/common.h"
+#include "zelda3/common.h"
 #include "util/hex.h"
 #include "imgui/imgui.h"
 

src/app/editor/overworld/overworld_entity_renderer.h

@@ -5,8 +5,8 @@
 
 #include "app/gfx/bitmap.h"
 #include "app/gui/canvas.h"
-#include "app/zelda3/common.h"
-#include "app/zelda3/overworld/overworld.h"
+#include "zelda3/common.h"
+#include "zelda3/overworld/overworld.h"
 #include "imgui/imgui.h"
 
 namespace yaze {

src/app/editor/overworld/scratch_space.cc

@@ -27,9 +27,9 @@
 #include "app/gui/input.h"
 #include "app/gui/style.h"
 #include "app/rom.h"
-#include "app/zelda3/common.h"
-#include "app/zelda3/overworld/overworld.h"
-#include "app/zelda3/overworld/overworld_map.h"
+#include "zelda3/common.h"
+#include "zelda3/overworld/overworld.h"
+#include "zelda3/overworld/overworld_map.h"
 #include "imgui/imgui.h"
 #include "imgui_memory_editor.h"
 #include "util/hex.h"

src/app/editor/overworld/tile16_editor.cc

@@ -12,7 +12,7 @@
 #include "app/gui/input.h"
 #include "app/gui/style.h"
 #include "app/rom.h"
-#include "app/zelda3/overworld/overworld.h"
+#include "zelda3/overworld/overworld.h"
 #include "imgui/imgui.h"
 #include "util/hex.h"
 #include "util/log.h"

src/app/editor/sprite/sprite_editor.cc

@@ -7,7 +7,7 @@
 #include "app/gfx/arena.h"
 #include "app/gui/icons.h"
 #include "app/gui/input.h"
-#include "app/zelda3/sprite/sprite.h"
+#include "zelda3/sprite/sprite.h"
 #include "util/hex.h"
 
 namespace yaze {

src/app/gfx/palette_manager.cc

@@ -252,12 +252,11 @@ absl::Status PaletteManager::SaveGroup(const std::string& group_name) {
     auto color_it = modified_colors_[group_name].find(palette_idx);
     if (color_it != modified_colors_[group_name].end()) {
       for (int color_idx : color_it->second) {
-        // Calculate ROM address
-        uint32_t address =
-            GetPaletteAddress(group_name, palette_idx, color_idx);
+        // Calculate ROM address using the helper function
+        uint32_t address = GetPaletteAddress(group_name, palette_idx, color_idx);
 
-        // Write color to ROM
-        RETURN_IF_ERROR(rom_->WriteColor(address, (*palette)[color_idx]));
+        // Write color to ROM - write the 16-bit SNES color value
+        rom_->WriteShort(address, (*palette)[color_idx].snes());
       }
     }
   }

src/app/gui/widgets/dungeon_object_emulator_preview.cc

@@ -1,8 +1,8 @@
 #include "app/gui/widgets/dungeon_object_emulator_preview.h"
 #include "app/gfx/backend/irenderer.h"
 
-#include "app/zelda3/dungeon/room.h"
-#include "app/zelda3/dungeon/room_object.h"
+#include "zelda3/dungeon/room.h"
+#include "zelda3/dungeon/room_object.h"
 #include "app/gui/widgets/widget_auto_register.h"
 #include "app/core/window.h"
 #include <cstdio>

src/app/test/rom_dependent_test_suite.h

@@ -7,7 +7,7 @@
 #include "absl/strings/str_format.h"
 #include "app/test/test_manager.h"
 #include "app/rom.h"
-#include "app/zelda3/overworld/overworld.h"
+#include "zelda3/overworld/overworld.h"
 #include "app/editor/overworld/tile16_editor.h"
 #include "app/gui/icons.h"
 

src/cli/handlers/README.md

@@ -277,7 +277,7 @@ formatter.EndObject();
 
 Command handlers are designed to work alongside the public C API defined in `incl/yaze.h` and `incl/zelda.h`. 
 
-- Handlers use internal C++ classes from `app/zelda3/`
+- Handlers use internal C++ classes from `zelda3/`
 - Output structures align with C API data types where possible
 - Future: C API bridge will expose commands to external applications
 

src/cli/handlers/agent/general_commands.cc

@@ -20,7 +20,7 @@
 #include "absl/time/time.h"
 #include "absl/strings/string_view.h"
 #include "app/core/project.h"
-#include "app/zelda3/dungeon/room.h"
+#include "zelda3/dungeon/room.h"
 #include "cli/handlers/agent/common.h"
 #include "cli/cli.h"
 #include "cli/service/ai/ai_service.h"

src/cli/handlers/game/dungeon.cc

@@ -1,6 +1,6 @@
 #include "cli/cli.h"
-#include "app/zelda3/dungeon/dungeon_editor_system.h"
-#include "app/zelda3/dungeon/room.h"
+#include "zelda3/dungeon/dungeon_editor_system.h"
+#include "zelda3/dungeon/room.h"
 #include "absl/flags/flag.h"
 #include "absl/flags/declare.h"
 

src/cli/handlers/game/dungeon_commands.cc

@@ -2,7 +2,7 @@
 
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_format.h"
-#include "app/zelda3/dungeon/dungeon_editor_system.h"
+#include "zelda3/dungeon/dungeon_editor_system.h"
 
 namespace yaze {
 namespace cli {

src/cli/handlers/game/overworld.cc

@@ -1,5 +1,5 @@
 #include "cli/cli.h"
-#include "app/zelda3/overworld/overworld.h"
+#include "zelda3/overworld/overworld.h"
 #include "cli/handlers/game/overworld_inspect.h"
 
 #include <algorithm>

src/cli/handlers/game/overworld_inspect.cc

@@ -10,11 +10,11 @@
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-#include "app/zelda3/common.h"
-#include "app/zelda3/overworld/overworld.h"
-#include "app/zelda3/overworld/overworld_entrance.h"
-#include "app/zelda3/overworld/overworld_exit.h"
-#include "app/zelda3/overworld/overworld_map.h"
+#include "zelda3/common.h"
+#include "zelda3/overworld/overworld.h"
+#include "zelda3/overworld/overworld_entrance.h"
+#include "zelda3/overworld/overworld_exit.h"
+#include "zelda3/overworld/overworld_map.h"
 #include "util/macro.h"
 
 namespace yaze {

src/cli/handlers/graphics/sprite_commands.cc

@@ -2,7 +2,7 @@
 
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_format.h"
-#include "app/zelda3/sprite/sprite.h"
+#include "zelda3/sprite/sprite.h"
 
 namespace yaze {
 namespace cli {

src/cli/handlers/rom/mock_rom.cc

@@ -6,7 +6,7 @@
 #include "absl/flags/flag.h"
 #include "absl/strings/str_format.h"
 #include "app/core/project.h"
-#include "app/zelda3/zelda3_labels.h"
+#include "zelda3/zelda3_labels.h"
 
 ABSL_DECLARE_FLAG(bool, mock_rom);
 

src/cli/service/agent/agent_pretraining.cc

@@ -2,7 +2,7 @@
 
 #include "absl/strings/str_format.h"
 #include "app/rom.h"
-#include "app/zelda3/overworld/overworld.h"
+#include "zelda3/overworld/overworld.h"
 
 namespace yaze {
 namespace cli {

src/cli/service/planning/tile16_proposal_generator.cc

@@ -7,7 +7,7 @@
 #include "absl/strings/str_split.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/numbers.h"
-#include "app/zelda3/overworld/overworld.h"
+#include "zelda3/overworld/overworld.h"
 #include "nlohmann/json.hpp"
 #include "util/macro.h"
 

src/yaze.cc

@@ -9,7 +9,7 @@
 
 #include "app/editor/message/message_data.h"
 #include "app/rom.h"
-#include "app/zelda3/overworld/overworld.h"
+#include "zelda3/overworld/overworld.h"
 #include "yaze_config.h"
 
 // Static variables for library state

src/zelda3/dungeon/dungeon_editor_system.h

@@ -13,9 +13,9 @@
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_palette.h"
 #include "app/rom.h"
-#include "app/zelda3/dungeon/room_object.h"
-#include "app/zelda3/dungeon/room.h"
-#include "app/zelda3/sprite/sprite.h"
+#include "zelda3/dungeon/room_object.h"
+#include "zelda3/dungeon/room.h"
+#include "zelda3/sprite/sprite.h"
 #include "dungeon_object_editor.h"
 
 namespace yaze {

src/zelda3/dungeon/dungeon_object_editor.h

@@ -13,8 +13,8 @@
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_palette.h"
 #include "app/rom.h"
-#include "app/zelda3/dungeon/room.h"
-#include "app/zelda3/dungeon/room_object.h"
+#include "zelda3/dungeon/room.h"
+#include "zelda3/dungeon/room_object.h"
 
 namespace yaze {
 namespace zelda3 {

src/zelda3/dungeon/object_drawer.h

@@ -10,7 +10,7 @@
 #include "app/gfx/snes_tile.h"
 #include "app/gfx/snes_palette.h"
 #include "app/rom.h"
-#include "app/zelda3/dungeon/room_object.h"
+#include "zelda3/dungeon/room_object.h"
 
 namespace yaze {
 namespace zelda3 {

src/zelda3/dungeon/object_parser.cc

@@ -4,7 +4,7 @@
 #include <cstring>
 
 #include "absl/strings/str_format.h"
-#include "app/zelda3/dungeon/room_object.h"
+#include "zelda3/dungeon/room_object.h"
 #include "util/log.h"
 
 // ROM addresses for object data (PC addresses, not SNES)

src/zelda3/dungeon/room.cc

@@ -10,9 +10,9 @@
 #include "app/gfx/snes_palette.h"
 #include "app/rom.h"
 #include "app/snes.h"
-#include "app/zelda3/dungeon/object_drawer.h"
-#include "app/zelda3/dungeon/room_object.h"
-#include "app/zelda3/sprite/sprite.h"
+#include "zelda3/dungeon/object_drawer.h"
+#include "zelda3/dungeon/room_object.h"
+#include "zelda3/sprite/sprite.h"
 #include "util/log.h"
 
 namespace yaze {

src/zelda3/dungeon/room.h

@@ -9,10 +9,10 @@
 
 #include "app/rom.h"
 #include "app/gfx/background_buffer.h"
-#include "app/zelda3/dungeon/dungeon_rom_addresses.h"
-#include "app/zelda3/dungeon/room_object.h"
-#include "app/zelda3/dungeon/room_layout.h"
-#include "app/zelda3/sprite/sprite.h"
+#include "zelda3/dungeon/dungeon_rom_addresses.h"
+#include "zelda3/dungeon/room_object.h"
+#include "zelda3/dungeon/room_layout.h"
+#include "zelda3/sprite/sprite.h"
 
 namespace yaze {
 namespace zelda3 {

src/zelda3/dungeon/room_layout.cc

@@ -2,7 +2,7 @@
 
 #include "absl/strings/str_format.h"
 #include "app/snes.h"
-#include "app/zelda3/dungeon/dungeon_rom_addresses.h"
+#include "zelda3/dungeon/dungeon_rom_addresses.h"
 
 namespace yaze::zelda3 {
 

src/zelda3/dungeon/room_layout.h

@@ -6,7 +6,7 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "app/rom.h"
-#include "app/zelda3/dungeon/room_object.h"
+#include "zelda3/dungeon/room_object.h"
 
 namespace yaze::zelda3 {
 

src/zelda3/dungeon/room_object.cc

@@ -1,7 +1,7 @@
 #include "room_object.h"
 
 #include "absl/status/status.h"
-#include "app/zelda3/dungeon/object_parser.h"
+#include "zelda3/dungeon/object_parser.h"
 #include "util/log.h"
 
 namespace yaze {

src/zelda3/dungeon/room_object.h

@@ -7,7 +7,7 @@
 
 #include "app/gfx/snes_tile.h"
 #include "app/rom.h"
-#include "app/zelda3/dungeon/object_parser.h"
+#include "zelda3/dungeon/object_parser.h"
 
 namespace yaze {
 namespace zelda3 {

src/zelda3/overworld/overworld.cc

@@ -15,8 +15,8 @@
 #include "app/gfx/snes_tile.h"
 #include "app/rom.h"
 #include "app/snes.h"
-#include "app/zelda3/overworld/overworld_entrance.h"
-#include "app/zelda3/overworld/overworld_exit.h"
+#include "zelda3/overworld/overworld_entrance.h"
+#include "zelda3/overworld/overworld_exit.h"
 #include "util/hex.h"
 #include "util/log.h"
 #include "util/macro.h"

src/zelda3/overworld/overworld.h

@@ -8,11 +8,11 @@
 #include "absl/status/status.h"
 #include "app/gfx/snes_tile.h"
 #include "app/rom.h"
-#include "app/zelda3/overworld/overworld_entrance.h"
-#include "app/zelda3/overworld/overworld_exit.h"
-#include "app/zelda3/overworld/overworld_item.h"
-#include "app/zelda3/overworld/overworld_map.h"
-#include "app/zelda3/sprite/sprite.h"
+#include "zelda3/overworld/overworld_entrance.h"
+#include "zelda3/overworld/overworld_exit.h"
+#include "zelda3/overworld/overworld_item.h"
+#include "zelda3/overworld/overworld_map.h"
+#include "zelda3/sprite/sprite.h"
 
 namespace yaze {
 namespace zelda3 {

src/zelda3/overworld/overworld_entrance.h

@@ -4,7 +4,7 @@
 #include <cstdint>
 
 #include "app/rom.h"
-#include "app/zelda3/common.h"
+#include "zelda3/common.h"
 #include "util/macro.h"
 
 namespace yaze {

src/zelda3/overworld/overworld_exit.h

@@ -4,7 +4,7 @@
 #include <cstdint>
 #include <iostream>
 
-#include "app/zelda3/common.h"
+#include "zelda3/common.h"
 
 namespace yaze {
 namespace zelda3 {

src/zelda3/overworld/overworld_item.h

@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "app/zelda3/common.h"
+#include "zelda3/common.h"
 
 namespace yaze {
 namespace zelda3 {

src/zelda3/overworld/overworld_map.cc

@@ -9,7 +9,7 @@
 #include "app/gfx/snes_color.h"
 #include "app/gfx/snes_tile.h"
 #include "app/rom.h"
-#include "app/zelda3/overworld/overworld.h"
+#include "zelda3/overworld/overworld.h"
 
 namespace yaze {
 namespace zelda3 {

src/zelda3/sprite/sprite.h

@@ -7,8 +7,8 @@
 #include <string>
 #include <vector>
 
-#include "app/zelda3/common.h"
-#include "app/zelda3/sprite/overlord.h"
+#include "zelda3/common.h"
+#include "zelda3/sprite/overlord.h"
 
 namespace yaze {
 namespace zelda3 {

src/zelda3/zelda3_labels.cc

@@ -1,9 +1,9 @@
-#include "app/zelda3/zelda3_labels.h"
+#include "zelda3/zelda3_labels.h"
 
-#include "app/zelda3/common.h"
-#include "app/zelda3/dungeon/room.h"
-#include "app/zelda3/sprite/sprite.h"
-#include "app/zelda3/sprite/overlord.h"
+#include "zelda3/common.h"
+#include "zelda3/dungeon/room.h"
+#include "zelda3/sprite/sprite.h"
+#include "zelda3/sprite/overlord.h"
 
 namespace yaze {
 namespace zelda3 {

src/zelda3/zelda3_library.cmake

@@ -1,21 +1,21 @@
 set(
   YAZE_APP_ZELDA3_SRC
-  app/zelda3/dungeon/dungeon_editor_system.cc
-  app/zelda3/dungeon/dungeon_object_editor.cc
-  app/zelda3/dungeon/object_drawer.cc
-  app/zelda3/dungeon/object_parser.cc
-  app/zelda3/dungeon/room.cc
-  app/zelda3/dungeon/room_layout.cc
-  app/zelda3/dungeon/room_object.cc
-  app/zelda3/music/tracker.cc
-  app/zelda3/overworld/overworld.cc
-  app/zelda3/overworld/overworld_map.cc
-  app/zelda3/screen/dungeon_map.cc
-  app/zelda3/screen/inventory.cc
-  app/zelda3/screen/title_screen.cc
-  app/zelda3/sprite/sprite.cc
-  app/zelda3/sprite/sprite_builder.cc
-  app/zelda3/zelda3_labels.cc
+  zelda3/dungeon/dungeon_editor_system.cc
+  zelda3/dungeon/dungeon_object_editor.cc
+  zelda3/dungeon/object_drawer.cc
+  zelda3/dungeon/object_parser.cc
+  zelda3/dungeon/room.cc
+  zelda3/dungeon/room_layout.cc
+  zelda3/dungeon/room_object.cc
+  zelda3/music/tracker.cc
+  zelda3/overworld/overworld.cc
+  zelda3/overworld/overworld_map.cc
+  zelda3/screen/dungeon_map.cc
+  zelda3/screen/inventory.cc
+  zelda3/screen/title_screen.cc
+  zelda3/sprite/sprite.cc
+  zelda3/sprite/sprite_builder.cc
+  zelda3/zelda3_labels.cc
 )
 
 # ==============================================================================

test/e2e/dungeon_object_rendering_e2e_tests.cc

@@ -60,8 +60,8 @@
 #include "app/core/window.h"
 #include "app/editor/dungeon/dungeon_editor_v2.h"
 #include "app/rom.h"
-#include "app/zelda3/dungeon/room.h"
-#include "app/zelda3/dungeon/room_object.h"
+#include "zelda3/dungeon/room.h"
+#include "zelda3/dungeon/room_object.h"
 #include "test_utils.h"
 
 namespace yaze {

test/e2e/overworld/overworld_e2e_test.cc

@@ -5,8 +5,8 @@
 #include <string>
 
 #include "app/rom.h"
-#include "app/zelda3/overworld/overworld.h"
-#include "app/zelda3/overworld/overworld_map.h"
+#include "zelda3/overworld/overworld.h"
+#include "zelda3/overworld/overworld_map.h"
 #include "testing.h"
 
 namespace yaze {

test/integration/dungeon_editor_test.cc

@@ -1,7 +1,7 @@
 #include "integration/dungeon_editor_test.h"
 
-#include "app/zelda3/dungeon/room.h"
-#include "app/zelda3/dungeon/room_object.h"
+#include "zelda3/dungeon/room.h"
+#include "zelda3/dungeon/room_object.h"
 
 namespace yaze {
 namespace test {

test/integration/dungeon_editor_test.h

@@ -6,7 +6,7 @@
 
 #include "app/editor/dungeon/dungeon_editor_v2.h"
 #include "app/rom.h"
-#include "app/zelda3/dungeon/room.h"
+#include "zelda3/dungeon/room.h"
 #include "gtest/gtest.h"
 
 namespace yaze {

test/integration/editor/tile16_editor_test.cc

@@ -10,7 +10,7 @@
 #include "app/gfx/backend/sdl2_renderer.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/tilemap.h"
-#include "app/zelda3/overworld/overworld.h"
+#include "zelda3/overworld/overworld.h"
 #include "app/core/window.h"
 
 namespace yaze {

test/integration/zelda3/dungeon_editor_system_integration_test.cc

@@ -5,9 +5,9 @@
 #include <chrono>
 
 #include "app/rom.h"
-#include "app/zelda3/dungeon/room.h"
-#include "app/zelda3/dungeon/dungeon_editor_system.h"
-#include "app/zelda3/dungeon/dungeon_object_editor.h"
+#include "zelda3/dungeon/room.h"
+#include "zelda3/dungeon/dungeon_editor_system.h"
+#include "zelda3/dungeon/dungeon_object_editor.h"
 
 namespace yaze {
 namespace zelda3 {

test/integration/zelda3/dungeon_object_rendering_tests.cc

@@ -6,9 +6,9 @@
 #define IMGUI_DEFINE_MATH_OPERATORS
 #endif
 
-#include "app/zelda3/dungeon/object_drawer.h"
-#include "app/zelda3/dungeon/room.h"
-#include "app/zelda3/dungeon/room_object.h"
+#include "zelda3/dungeon/object_drawer.h"
+#include "zelda3/dungeon/room.h"
+#include "zelda3/dungeon/room_object.h"
 
 #include <gtest/gtest.h>
 #include <memory>

test/integration/zelda3/dungeon_object_rendering_tests_new.cc

@@ -2,9 +2,9 @@
 // Updated for DungeonEditorV2 architecture - uses ObjectDrawer (production system)
 // instead of the obsolete ObjectRenderer
 
-#include "app/zelda3/dungeon/object_drawer.h"
-#include "app/zelda3/dungeon/room.h"
-#include "app/zelda3/dungeon/room_object.h"
+#include "zelda3/dungeon/object_drawer.h"
+#include "zelda3/dungeon/room.h"
+#include "zelda3/dungeon/room_object.h"
 
 #include <gtest/gtest.h>
 #include <memory>

test/integration/zelda3/dungeon_rendering_test.cc

@@ -4,10 +4,10 @@
 #include "app/gfx/background_buffer.h"
 #include "app/gfx/snes_palette.h"
 #include "app/rom.h"
-#include "app/zelda3/dungeon/object_drawer.h"
-#include "app/zelda3/dungeon/object_parser.h"
-#include "app/zelda3/dungeon/room.h"
-#include "app/zelda3/dungeon/room_object.h"
+#include "zelda3/dungeon/object_drawer.h"
+#include "zelda3/dungeon/object_parser.h"
+#include "zelda3/dungeon/room.h"
+#include "zelda3/dungeon/room_object.h"
 
 namespace yaze {
 namespace zelda3 {

test/integration/zelda3/dungeon_room_test.cc

@@ -2,7 +2,7 @@
 #include <gtest/gtest.h>
 
 #include "app/rom.h"
-#include "app/zelda3/dungeon/room.h"
+#include "zelda3/dungeon/room.h"
 
 namespace yaze {
 namespace test {

test/integration/zelda3/overworld_integration_test.cc

@@ -5,8 +5,8 @@
 #include <string>
 
 #include "app/rom.h"
-#include "app/zelda3/overworld/overworld.h"
-#include "app/zelda3/overworld/overworld_map.h"
+#include "zelda3/overworld/overworld.h"
+#include "zelda3/overworld/overworld_map.h"
 #include "testing.h"
 
 namespace yaze {

test/integration/zelda3/room_integration_test.cc

@@ -5,8 +5,8 @@
 #include <gmock/gmock.h>
 
 #include "app/rom.h"
-#include "app/zelda3/dungeon/room.h"
-#include "app/zelda3/dungeon/room_object.h"
+#include "zelda3/dungeon/room.h"
+#include "zelda3/dungeon/room_object.h"
 
 // Helper function for SNES to PC address conversion
 inline int SnesToPc(int addr) {

test/integration/zelda3/sprite_position_test.cc

@@ -5,8 +5,8 @@
 #include <fstream>
 
 #include "app/rom.h"
-#include "app/zelda3/overworld/overworld.h"
-#include "app/zelda3/overworld/overworld_map.h"
+#include "zelda3/overworld/overworld.h"
+#include "zelda3/overworld/overworld_map.h"
 
 namespace yaze {
 namespace zelda3 {

test/unit/zelda3/dungeon/object_rendering_test.cc

@@ -4,9 +4,9 @@
 #include "app/gfx/background_buffer.h"
 #include "app/gfx/snes_palette.h"
 #include "app/rom.h"
-#include "app/zelda3/dungeon/object_drawer.h"
-#include "app/zelda3/dungeon/object_parser.h"
-#include "app/zelda3/dungeon/room_object.h"
+#include "zelda3/dungeon/object_drawer.h"
+#include "zelda3/dungeon/object_parser.h"
+#include "zelda3/dungeon/room_object.h"
 
 namespace yaze {
 namespace zelda3 {

test/unit/zelda3/dungeon/room_manipulation_test.cc

@@ -2,8 +2,8 @@
 
 #include <gtest/gtest.h>
 #include "app/rom.h"
-#include "app/zelda3/dungeon/room.h"
-#include "app/zelda3/dungeon/room_object.h"
+#include "zelda3/dungeon/room.h"
+#include "zelda3/dungeon/room_object.h"
 
 namespace yaze {
 namespace zelda3 {