From c661e62d40bf219f6e9a28a27d23656d4cb6e67a Mon Sep 17 00:00:00 2001
From: Aetias <aetias@outlook.com>
Date: Sat, 2 Mar 2024 08:29:32 +0100
Subject: [PATCH] Organize source code structure

---
 include/{dtcm => DTCM}/UnkStruct_027e1058.hpp |  0
 include/{dtcm => DTCM}/UnkStruct_027e105c.hpp |  0
 include/{ => Item}/Item.hpp                   |  0
 include/{ => Item}/ItemManager.hpp            | 22 +++++--------------
 include/Player/EquipItem.hpp                  |  5 +++--
 include/{ => System}/OverlayManager.hpp       |  3 ++-
 include/{ => System}/SysNew.hpp               |  0
 src/{ => Item}/ItemManager.cpp                |  2 +-
 tools/lcf.py                                  |  2 +-
 9 files changed, 13 insertions(+), 21 deletions(-)
 rename include/{dtcm => DTCM}/UnkStruct_027e1058.hpp (100%)
 rename include/{dtcm => DTCM}/UnkStruct_027e105c.hpp (100%)
 rename include/{ => Item}/Item.hpp (100%)
 rename include/{ => Item}/ItemManager.hpp (92%)
 rename include/{ => System}/OverlayManager.hpp (98%)
 rename include/{ => System}/SysNew.hpp (100%)
 rename src/{ => Item}/ItemManager.cpp (96%)

diff --git a/include/dtcm/UnkStruct_027e1058.hpp b/include/DTCM/UnkStruct_027e1058.hpp
similarity index 100%
rename from include/dtcm/UnkStruct_027e1058.hpp
rename to include/DTCM/UnkStruct_027e1058.hpp
diff --git a/include/dtcm/UnkStruct_027e105c.hpp b/include/DTCM/UnkStruct_027e105c.hpp
similarity index 100%
rename from include/dtcm/UnkStruct_027e105c.hpp
rename to include/DTCM/UnkStruct_027e105c.hpp
diff --git a/include/Item.hpp b/include/Item/Item.hpp
similarity index 100%
rename from include/Item.hpp
rename to include/Item/Item.hpp
diff --git a/include/ItemManager.hpp b/include/Item/ItemManager.hpp
similarity index 92%
rename from include/ItemManager.hpp
rename to include/Item/ItemManager.hpp
index 07f726a4..42445af7 100644
--- a/include/ItemManager.hpp
+++ b/include/Item/ItemManager.hpp
@@ -1,24 +1,14 @@
 #pragma once
 
+#include "global.h"
 #include "types.h"
 #include "lib/math.h"
-#include "global.h"
-#include "SysNew.hpp"
-#include "Item.hpp"
-#include "Player/EquipItem.hpp"
-#include "Player/EquipBomb.hpp"
-#include "Player/EquipBombchu.hpp"
-#include "Player/EquipBoomerang.hpp"
-#include "Player/EquipBow.hpp"
-#include "Player/EquipHammer.hpp"
-#include "Player/EquipItem.hpp"
-#include "Player/EquipPotion.hpp"
-#include "Player/EquipRope.hpp"
-#include "Player/EquipScoop.hpp"
-#include "Player/EquipShield.hpp"
-#include "Player/EquipSword.hpp"
+
 #include "Actors/Navi/Navi.hpp"
-#include "OverlayManager.hpp"
+#include "Item/Item.hpp"
+#include "Player/EquipItem.hpp"
+#include "System/SysNew.hpp"
+#include "System/OverlayManager.hpp"
 
 #define MAX_HOURGLASS_SECONDS 1500 // 25 minutes
 
diff --git a/include/Player/EquipItem.hpp b/include/Player/EquipItem.hpp
index 1108d23f..c4159185 100644
--- a/include/Player/EquipItem.hpp
+++ b/include/Player/EquipItem.hpp
@@ -2,8 +2,9 @@
 
 #include "types.h"
 #include "global.h"
-#include "Item.hpp"
-#include "SysNew.hpp"
+
+#include "Item/Item.hpp"
+#include "System/SysNew.hpp"
 
 class EquipItem : public SysObject {
 private:
diff --git a/include/OverlayManager.hpp b/include/System/OverlayManager.hpp
similarity index 98%
rename from include/OverlayManager.hpp
rename to include/System/OverlayManager.hpp
index b3d3621d..dfeacebe 100644
--- a/include/OverlayManager.hpp
+++ b/include/System/OverlayManager.hpp
@@ -1,7 +1,8 @@
 #pragma once
 
 #include "types.h"
-#include "Item.hpp"
+
+#include "Item/Item.hpp"
 
 typedef u32 OverlayId;
 enum OverlayId_ {
diff --git a/include/SysNew.hpp b/include/System/SysNew.hpp
similarity index 100%
rename from include/SysNew.hpp
rename to include/System/SysNew.hpp
diff --git a/src/ItemManager.cpp b/src/Item/ItemManager.cpp
similarity index 96%
rename from src/ItemManager.cpp
rename to src/Item/ItemManager.cpp
index 70d772ad..742a3f81 100644
--- a/src/ItemManager.cpp
+++ b/src/Item/ItemManager.cpp
@@ -1,4 +1,4 @@
-#include "ItemManager.hpp"
+#include "Item/ItemManager.hpp"
 
 extern u32 *data_027e0ce0[];
 
diff --git a/tools/lcf.py b/tools/lcf.py
index be580d40..c7884028 100644
--- a/tools/lcf.py
+++ b/tools/lcf.py
@@ -24,7 +24,7 @@ DTCM_OBJECTS = [
 
 ov00 = Overlay(name='ov00', after='ARM9', objects=[
     'asm/ov00/ov00_020773c0.s',
-    'src/ItemManager.cpp',
+    'src/Item/ItemManager.cpp',
     'asm/ov00/ItemManager/ItemManager.s',
     'asm/ov00/ov00_020ae7a4.s',
     'asm/ov00/ov00_init.s'