Reorganize includes to match asm

include/Kyoto/CFactoryMgr.hpp

@@ -5,7 +5,7 @@
 
 #include "CToken.hpp"
 #include "IObjectStore.hpp"
-#include "TGameTypes.hpp"
+#include "Streams/CInputStream.hpp"
 
 class CFactoryMgr {
 public:

include/Kyoto/CPakFile.hpp

@@ -8,7 +8,7 @@
 
 #include "CDvdFile.hpp"
 #include "CResLoader.hpp"
-#include "TGameTypes.hpp"
+#include "IObjectStore.hpp"
 
 class CPakFile : CDvdFile {
 public:

include/Kyoto/CResLoader.hpp

@@ -6,7 +6,7 @@
 #include "rstl/list.hpp"
 #include "rstl/string.hpp"
 
-#include "TGameTypes.hpp"
+#include "IObjectStore.hpp"
 
 class CPakFile;
 

include/Kyoto/Graphics/CGraphics.hpp

@@ -3,6 +3,9 @@
 
 #include "types.h"
 
+#include "Kyoto/Math/CColor.hpp"
+#include "Kyoto/Math/CVector3f.hpp"
+
 #include "CTevCombiners.hpp"
 
 enum ERglTevStage {

include/Kyoto/IObjectStore.hpp

@@ -5,7 +5,15 @@
 
 #include "rstl/rc_ptr.hpp"
 
-#include "TGameTypes.hpp"
+typedef u32 CAssetId;
+typedef u32 FourCC;
+
+struct SObjectTag {
+  FourCC type;
+  CAssetId id;
+
+  SObjectTag(const SObjectTag& other) : type(other.type), id(other.id) {}
+};
 
 class IObjectStore;
 class IObj;

include/Kyoto/Streams/CMemoryInStream.hpp

@@ -12,7 +12,8 @@ public:
 
   CMemoryInStream(const void* ptr, unsigned long len);
   CMemoryInStream(const void* ptr, unsigned long len, EOwnerShip ownership);
-  virtual ~CMemoryInStream() {}
+  virtual ~CMemoryInStream() override {}
+  virtual u32 Read(void* dest, u32 len) override;
 };
 
 #endif

include/Kyoto/Text/CStringTable.hpp

@@ -5,7 +5,7 @@
 
 #include "rstl/single_ptr.hpp"
 
-#include "CInputStream.hpp"
+#include "Kyoto/Streams/CInputStream.hpp"
 
 class CStringTable {
   s32 x0_stringCount;

include/Kyoto_CWD/TGameTypes.hpp

@@ -1,31 +0,0 @@
-#ifndef _TGAMETYPES_HPP
-#define _TGAMETYPES_HPP
-
-#include "types.h"
-
-typedef s32 TAreaId;
-typedef s32 TEditorId;
-typedef u16 TUniqueId;
-
-extern TAreaId kInvalidAreaId;
-extern TEditorId kInvalidEditorId;
-extern TUniqueId kInvalidUniqueId;
-
-typedef u32 CAssetId;
-// class CAssetId {
-// public:
-//   u32 id;
-
-//   bool operator==(const CAssetId& other) { return id == other.id; }
-// };
-
-#define FourCC u32
-
-struct SObjectTag {
-  FourCC type;
-  CAssetId id;
-
-  SObjectTag(const SObjectTag& other) : type(other.type), id(other.id) {}
-};
-
-#endif

include/MetroidPrime/CGameArchitectureSupport.hpp

@@ -4,9 +4,9 @@
 #include "types.h"
 
 #include "CIOWinManager.hpp"
-#include "COsContext.hpp"
-#include "CStopwatch.hpp"
-#include "TOneStatic.hpp"
+#include "Kyoto/Basics/COsContext.hpp"
+#include "Kyoto/Basics/CStopwatch.hpp"
+#include "Kyoto/TOneStatic.hpp"
 
 class CGameArchitectureSupport : public TOneStatic< CGameArchitectureSupport > {
 public:

include/MetroidPrime/CGameGlobalObjects.hpp

@@ -6,19 +6,19 @@
 #include "rstl/optional_object.hpp"
 #include "rstl/single_ptr.hpp"
 
-#include "CAiFuncMap.hpp"
-#include "CCharacterFactoryBuilder.hpp"
-#include "CGameState.hpp"
-#include "CGraphicsSys.hpp"
 #include "CInGameTweakManager.hpp"
-#include "CMemoryCardSys.hpp"
-#include "CMemorySys.hpp"
-#include "COsContext.hpp"
-#include "CRasterFont.hpp"
-#include "CResFactory.hpp"
-#include "CSimplePool.hpp"
-#include "CToken.hpp"
-#include "TOneStatic.hpp"
+#include "Enemies/CAiFuncMap.hpp"
+#include "Factories/CCharacterFactoryBuilder.hpp"
+#include "Kyoto/Basics/COsContext.hpp"
+#include "Kyoto/CMemoryCardSys.hpp"
+#include "Kyoto/CMemorySys.hpp"
+#include "Kyoto/CResFactory.hpp"
+#include "Kyoto/CSimplePool.hpp"
+#include "Kyoto/CToken.hpp"
+#include "Kyoto/Graphics/CGraphicsSys.hpp"
+#include "Kyoto/Text/CRasterFont.hpp"
+#include "Kyoto/TOneStatic.hpp"
+#include "Player/CGameState.hpp"
 
 class CGameGlobalObjects : public TOneStatic< CGameGlobalObjects > {
 public:

include/MetroidPrime/CMain.hpp

@@ -7,13 +7,13 @@
 
 #include "CGameArchitectureSupport.hpp"
 #include "CGameGlobalObjects.hpp"
-#include "CInputStream.hpp"
-#include "CMemorySys.hpp"
-#include "COsContext.hpp"
-#include "CStopwatch.hpp"
-#include "CTweaks.hpp"
-#include "TReservedAverage.hpp"
-#include "TGameTypes.hpp"
+#include "Kyoto/Basics/COsContext.hpp"
+#include "Kyoto/Basics/CStopwatch.hpp"
+#include "Kyoto/CMemorySys.hpp"
+#include "Kyoto/Streams/CInputStream.hpp"
+#include "Kyoto/TReservedAverage.hpp"
+#include "MetroidPrime/TGameTypes.hpp"
+#include "MetroidPrime/Tweaks/CTweaks.hpp"
 
 class CMain {
 public:

include/MetroidPrime/Player/CGameOptions.hpp

@@ -7,8 +7,8 @@
 #include "rstl/reserved_vector.hpp"
 #include "rstl/vector.hpp"
 
-#include "CInputStream.hpp"
-#include "TGameTypes.hpp"
+#include "Kyoto/Streams/CInputStream.hpp"
+#include "MetroidPrime/TGameTypes.hpp"
 
 class CGameOptions {
 public:

include/MetroidPrime/Player/CGameState.hpp

@@ -8,13 +8,12 @@
 #include "rstl/vector.hpp"
 
 #include "CGameOptions.hpp"
-#include "CGameState.hpp"
 #include "CHintOptions.hpp"
 #include "CPlayerState.hpp"
 #include "CSystemOptions.hpp"
 #include "CWorldState.hpp"
 #include "CWorldTransManager.hpp"
-#include "TGameTypes.hpp"
+#include "MetroidPrime/TGameTypes.hpp"
 
 class CGameState {
 public:

include/MetroidPrime/Player/CSystemOptions.hpp

@@ -3,11 +3,12 @@
 
 #include "types.h"
 
-#include "TGameTypes.hpp"
 #include "rstl/pair.hpp"
 #include "rstl/reserved_vector.hpp"
 #include "rstl/vector.hpp"
 
+#include "MetroidPrime/TGameTypes.hpp"
+
 class CSystemOptions {
 public:
   CSystemOptions();

include/MetroidPrime/TGameTypes.hpp

@@ -0,0 +1,14 @@
+#ifndef _TGAMETYPES_HPP
+#define _TGAMETYPES_HPP
+
+#include "types.h"
+
+typedef s32 TAreaId;
+typedef s32 TEditorId;
+typedef u16 TUniqueId;
+
+extern TAreaId kInvalidAreaId;
+extern TEditorId kInvalidEditorId;
+extern TUniqueId kInvalidUniqueId;
+
+#endif

include/MetroidPrime/UserNames.hpp

@@ -1,5 +1,6 @@
 #ifndef __USERNAMES_HPP_
 #define __USERNAMES_HPP_
+
 #include "types.h"
 
 bool IsUser(int name);

include/rstl/rmemory_allocator.hpp

@@ -3,7 +3,7 @@
 
 #include "types.h"
 
-#include "../Kyoto_CWD/CMemory.hpp"
+#include "Kyoto/Alloc/CMemory.hpp"
 
 namespace rstl {
 struct rmemory_allocator {

src/Kyoto/Basics/CSWDataDolphin.cpp

@@ -1,4 +1,4 @@
-#include "Kyoto_CWD/CStopwatch.hpp"
+#include "Kyoto/Basics/CStopwatch.hpp"
 
 #include "Dolphin/os.h"
 

src/Kyoto/Streams/CInputStream.cpp

@@ -1,8 +1,8 @@
-#include "Kyoto_CWD/CInputStream.hpp"
+#include "Kyoto/Streams/CInputStream.hpp"
 
 #include "string.h"
 
-#include "Kyoto_CWD/CMemory.hpp"
+#include "Kyoto/Alloc/CMemory.hpp"
 
 static u8 c;
 static u16 s;

src/Kyoto/Text/CStringTable.cpp

@@ -1,10 +1,9 @@
-#include "Kyoto_CWD/CStringTable.hpp"
+#include "Kyoto/Text/CStringTable.hpp"
 
 #include "rstl/pair.hpp"
 #include "rstl/vector.hpp"
 
-#include "Kyoto_CWD/CFactoryMgr.hpp"
-#include "Kyoto_CWD/TGameTypes.hpp"
+#include "Kyoto/CFactoryMgr.hpp"
 
 static FourCC mCurrentLanguage = 'ENGL';
 

src/MetroidPrime/Cameras/CCameraFilter.cpp

@@ -1,6 +1,6 @@
-#include "Kyoto_CWD/CCameraFilterPass.hpp"
-#include "Kyoto_CWD/CCubeRenderer.hpp"
-#include "Kyoto_CWD/CGraphics.hpp"
+#include "MetroidPrime/Cameras/CCameraFilterPass.hpp"
+#include "MetaRender/CCubeRenderer.hpp"
+#include "Kyoto/Graphics/CGraphics.hpp"
 
 // FIXME non-matching https://decomp.me/scratch/8N81d
 void CCameraFilterPass::DrawWideScreen(const CColor& color, const CTexture* tex, f32 lod) {

src/MetroidPrime/UserNames.cpp

@@ -1,6 +1,6 @@
 #include "types.h"
 
-#include "Kyoto_CWD/UserNames.hpp"
+#include "MetroidPrime/UserNames.hpp"
 
 bool IsUser(int name) {
     return name == 1;

src/MetroidPrime/main.cpp

@@ -1,30 +1,30 @@
-#include "Kyoto_CWD/CMain.hpp"
+#include "MetroidPrime/CMain.hpp"
 
+#include "Dolphin/os.h"
 #include "Dolphin/OSCache.h"
 #include "Dolphin/PPCArch.h"
-#include "Dolphin/os.h"
 
-#include "Kyoto_CWD/CARAMManager.hpp"
-#include "Kyoto_CWD/CARAMToken.hpp"
-#include "Kyoto_CWD/CBasics.hpp"
-#include "Kyoto_CWD/CCharacterFactoryBuilder.hpp"
-#include "Kyoto_CWD/CCubeRenderer.hpp"
-#include "Kyoto_CWD/CGameGlobalObjects.hpp"
-#include "Kyoto_CWD/CGameOptions.hpp"
-#include "Kyoto_CWD/CGameState.hpp"
-#include "Kyoto_CWD/CGraphics.hpp"
-#include "Kyoto_CWD/CInGameTweakManager.hpp"
-#include "Kyoto_CWD/CMemoryCardSys.hpp"
-#include "Kyoto_CWD/CMemoryInStream.hpp"
-#include "Kyoto_CWD/CPakFile.hpp"
-#include "Kyoto_CWD/CPlayerState.hpp"
-#include "Kyoto_CWD/CResFactory.hpp"
-#include "Kyoto_CWD/CSfxManager.hpp"
-#include "Kyoto_CWD/CSimplePool.hpp"
-#include "Kyoto_CWD/CStreamAudioManager.hpp"
-#include "Kyoto_CWD/CStringTable.hpp"
-#include "Kyoto_CWD/CSystemOptions.hpp"
-#include "Kyoto_CWD/CTweakGame.hpp"
+#include "Kyoto/Audio/CSfxManager.hpp"
+#include "Kyoto/Audio/CStreamAudioManager.hpp"
+#include "Kyoto/Basics/CBasics.hpp"
+#include "Kyoto/CARAMManager.hpp"
+#include "Kyoto/CARAMToken.hpp"
+#include "Kyoto/CMemoryCardSys.hpp"
+#include "Kyoto/CPakFile.hpp"
+#include "Kyoto/CResFactory.hpp"
+#include "Kyoto/CSimplePool.hpp"
+#include "Kyoto/Graphics/CGraphics.hpp"
+#include "Kyoto/Streams/CMemoryInStream.hpp"
+#include "Kyoto/Text/CStringTable.hpp"
+#include "MetaRender/CCubeRenderer.hpp"
+#include "MetroidPrime/CGameGlobalObjects.hpp"
+#include "MetroidPrime/CInGameTweakManager.hpp"
+#include "MetroidPrime/Factories/CCharacterFactoryBuilder.hpp"
+#include "MetroidPrime/Player/CGameOptions.hpp"
+#include "MetroidPrime/Player/CGameState.hpp"
+#include "MetroidPrime/Player/CPlayerState.hpp"
+#include "MetroidPrime/Player/CSystemOptions.hpp"
+#include "MetroidPrime/Tweaks/CTweakGame.hpp"
 
 extern "C" {
 // something pad