diff options
| author | Aetias <aetias@outlook.com> | 2024-03-02 08:29:32 +0100 |
|---|---|---|
| committer | Aetias <aetias@outlook.com> | 2024-03-02 08:29:32 +0100 |
| commit | c661e62d40bf219f6e9a28a27d23656d4cb6e67a (patch) | |
| tree | dc082b4a138ab9f1dba7aa64b23f3ea693dd5d84 | |
| parent | 36223d28a1d6d2dd209f324d363f5dafdbf50013 (diff) | |
Organize source code structure
| -rw-r--r-- | include/DTCM/UnkStruct_027e1058.hpp (renamed from include/dtcm/UnkStruct_027e1058.hpp) | 0 | ||||
| -rw-r--r-- | include/DTCM/UnkStruct_027e105c.hpp (renamed from include/dtcm/UnkStruct_027e105c.hpp) | 0 | ||||
| -rw-r--r-- | include/Item/Item.hpp (renamed from include/Item.hpp) | 0 | ||||
| -rw-r--r-- | include/Item/ItemManager.hpp (renamed from include/ItemManager.hpp) | 22 | ||||
| -rw-r--r-- | include/Player/EquipItem.hpp | 5 | ||||
| -rw-r--r-- | include/System/OverlayManager.hpp (renamed from include/OverlayManager.hpp) | 3 | ||||
| -rw-r--r-- | include/System/SysNew.hpp (renamed from include/SysNew.hpp) | 0 | ||||
| -rw-r--r-- | src/Item/ItemManager.cpp (renamed from src/ItemManager.cpp) | 2 | ||||
| -rw-r--r-- | tools/lcf.py | 2 |
9 files changed, 13 insertions, 21 deletions
diff --git a/include/dtcm/UnkStruct_027e1058.hpp b/include/DTCM/UnkStruct_027e1058.hpp index 6ce7ce4a..6ce7ce4a 100644 --- a/include/dtcm/UnkStruct_027e1058.hpp +++ b/include/DTCM/UnkStruct_027e1058.hpp diff --git a/include/dtcm/UnkStruct_027e105c.hpp b/include/DTCM/UnkStruct_027e105c.hpp index ac88044c..ac88044c 100644 --- a/include/dtcm/UnkStruct_027e105c.hpp +++ b/include/DTCM/UnkStruct_027e105c.hpp diff --git a/include/Item.hpp b/include/Item/Item.hpp index ab759d21..ab759d21 100644 --- a/include/Item.hpp +++ b/include/Item/Item.hpp diff --git a/include/ItemManager.hpp b/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 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 index 20d4a46f..20d4a46f 100644 --- a/include/SysNew.hpp +++ b/include/System/SysNew.hpp diff --git a/src/ItemManager.cpp b/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' |