Organize source code structure

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
 

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:

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_ {

src/Item/ItemManager.cpp

@@ -1,4 +1,4 @@
-#include "ItemManager.hpp"
+#include "Item/ItemManager.hpp"
 
 extern u32 *data_027e0ce0[];
 

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'