From 3addd51bbc2191050e5bf1f54261d1352bb0216c Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya0@users.noreply.github.com>
Date: Sat, 25 Jul 2026 03:46:06 -0400
Subject: [PATCH] Move the asset tools under soh/assets

soh-torch and soh-o2r-packer both exist to turn assets into archives, so
they sit better beside the assets they read than at the repo root.

Nothing tangled: both targets are declared in the root CMakeLists with
explicit paths rather than add_subdirectory, and soh/CMakeLists.txt globs
only include/, soh/ and src/, so sources under assets/ aren't swept into
the soh target.
---
 CMakeLists.txt                                            | 6 +++---
 {tools => soh/assets/tools}/soh-o2r-packer/PngTexture.cpp | 0
 {tools => soh/assets/tools}/soh-o2r-packer/PngTexture.h   | 0
 {tools => soh/assets/tools}/soh-o2r-packer/main.cpp       | 0
 {tools => soh/assets/tools}/torch-cli/main.cpp            | 0
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename {tools => soh/assets/tools}/soh-o2r-packer/PngTexture.cpp (100%)
 rename {tools => soh/assets/tools}/soh-o2r-packer/PngTexture.h (100%)
 rename {tools => soh/assets/tools}/soh-o2r-packer/main.cpp (100%)
 rename {tools => soh/assets/tools}/torch-cli/main.cpp (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b49056827..dae6ee87f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -240,15 +240,15 @@ endif()
 # Build-time ROM extraction. soh links torch as a static library, which compiles out torch's
 # own CLI, so this supplies an entry point around the same code the game runs.
 add_executable(soh-torch
-    ${CMAKE_CURRENT_SOURCE_DIR}/tools/torch-cli/main.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/tools/torch-cli/main.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/soh/soh/Extractor/TorchExtract.cpp
 )
 target_include_directories(soh-torch PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/soh/soh/Extractor)
 target_link_libraries(soh-torch PRIVATE torch)
 
 add_executable(soh-o2r-packer
-    ${CMAKE_CURRENT_SOURCE_DIR}/tools/soh-o2r-packer/main.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/tools/soh-o2r-packer/PngTexture.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/tools/soh-o2r-packer/main.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/tools/soh-o2r-packer/PngTexture.cpp
 )
 target_link_libraries(soh-o2r-packer PRIVATE torch)
 
diff --git a/tools/soh-o2r-packer/PngTexture.cpp b/soh/assets/tools/soh-o2r-packer/PngTexture.cpp
similarity index 100%
rename from tools/soh-o2r-packer/PngTexture.cpp
rename to soh/assets/tools/soh-o2r-packer/PngTexture.cpp
diff --git a/tools/soh-o2r-packer/PngTexture.h b/soh/assets/tools/soh-o2r-packer/PngTexture.h
similarity index 100%
rename from tools/soh-o2r-packer/PngTexture.h
rename to soh/assets/tools/soh-o2r-packer/PngTexture.h
diff --git a/tools/soh-o2r-packer/main.cpp b/soh/assets/tools/soh-o2r-packer/main.cpp
similarity index 100%
rename from tools/soh-o2r-packer/main.cpp
rename to soh/assets/tools/soh-o2r-packer/main.cpp
diff --git a/tools/torch-cli/main.cpp b/soh/assets/tools/torch-cli/main.cpp
similarity index 100%
rename from tools/torch-cli/main.cpp
rename to soh/assets/tools/torch-cli/main.cpp