Add and run format_include.py

format_include.py

@@ -0,0 +1,71 @@
+from pathlib import Path
+import re
+import os
+
+INCLUDE_PATTERN = re.compile(r'^#include (?:<([^<>]+)>|"([^"]+)")', re.MULTILINE)
+
+LIBRARIES: list[tuple[Path, Path]] = [
+    (Path("include/"),                 Path("src/Game/")),       # Game
+    (Path("libs/JSystem/include/"),    Path("src/JSystem/")),    # JSystem
+    (Path("libs/MetroTRK/include/"),   Path("src/MetroTRK/")),   # MetroTRK
+    (Path("libs/MSL_C/include/"),      Path("src/MSL_C/")),      # MSL_C
+    (Path("libs/MSL_C++/include/"),    Path("src/MSL_C++/")),    # MSL_C++
+    (Path("libs/nw4r/include/"),       Path("src/nw4r/")),       # nw4r
+    (Path("libs/Runtime/include/"),    Path("src/Runtime/")),    # Runtime
+    (Path("libs/RVL_SDK/include/"),    Path("src/RVL_SDK/")),    # RVL_SDK
+    (Path("libs/RVLFaceLib/include/"), Path("src/RVLFaceLib/")), # RVLFaceLib
+]
+
+EXTENSIONS: list[str] = [
+    ".c",
+    ".cpp",
+    ".h",
+    ".hpp",
+]
+
+def is_local_include(header: str, local_include_directory: Path) -> bool:
+    return (local_include_directory / header).exists()
+
+def format_include(match: re.Match, local_include_directory: Path) -> str:
+    header: str = match.group(1) or match.group(2)
+    header = header.replace('\\', '/')
+
+    if is_local_include(header, local_include_directory):
+        return f'#include "{header}"'
+
+    return f'#include <{header}>'
+
+def format_file(file_path: Path, local_include_directory: Path) -> None:
+    with open(file_path, 'r', encoding='utf-8') as f:
+        text: str = f.read()
+
+    text_replaced: str = INCLUDE_PATTERN.sub(lambda match: format_include(match, local_include_directory), text)
+
+    if text != text_replaced:
+        with open(file_path, 'w', encoding='utf-8') as f:
+            f.write(text_replaced)
+
+def format_files(directory: Path, local_include_directory: Path):
+    for root, dirs, files in os.walk(directory):
+        for file in files:
+            for extension in EXTENSIONS:
+                if file.endswith(extension):
+                    break
+            else:
+                continue
+
+            file_path: Path = Path(os.path.join(root, file))
+
+            print(f'[{local_include_directory}] Formatting {file_path}')
+            format_file(file_path, local_include_directory)
+
+def format_all():
+    for (include_directory, source_directory) in LIBRARIES:
+        if include_directory.is_dir():
+            format_files(include_directory, include_directory)
+
+            if source_directory.is_dir():
+                format_files(source_directory, include_directory)
+
+if __name__ == "__main__":
+    format_all()

include/Game/AreaObj/AreaForm.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JSystem/JGeometry/TMatrix.hpp"
+#include <JSystem/JGeometry/TMatrix.hpp>
 #include <JSystem/JGeometry.hpp>
 
 class JMapInfoIter;

include/Game/AudioLib.hpp

@@ -11,5 +11,5 @@
 #include "Game/AudioLib/AudSoundObject.hpp"
 #include "Game/AudioLib/AudSpeakerWrap.hpp"
 #include "Game/AudioLib/AudSystem.hpp"
-#include "Game/AudioLib/AudSystemWrapper.hpp"
+#include <Game/AudioLib/AudSystemWrapper.hpp>
 #include "Game/AudioLib/AudWrap.hpp"

include/Game/AudioLib/AudAudible.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "Game/AudioLib/AudAudience.hpp"
-#include "JSystem/JAudio2/JAISound.hpp"
-#include "JSystem/JAudio2/JASSoundParams.hpp"
+#include <JSystem/JAudio2/JAISound.hpp>
+#include <JSystem/JAudio2/JASSoundParams.hpp>
 #include <JSystem/JAudio2/JAIAudible.hpp>
 #include <JSystem/JAudio2/JASHeapCtrl.hpp>
 #include <JSystem/JAudio2/JAUAudible.hpp>

include/Game/AudioLib/AudAudience.hpp

@@ -2,11 +2,11 @@
 
 #include "Game/AudioLib/AudAudible.hpp"
 #include "Game/Util/MathUtil.hpp"
-#include "JSystem/JAudio2/JAISound.hpp"
-#include "JSystem/JAudio2/JASSoundParams.hpp"
-#include "JSystem/JAudio2/JAUAudible.hpp"
-#include "JSystem/JAudio2/JAUSoundInfo.hpp"
-#include "JSystem/JGeometry/TUtil.hpp"
+#include <JSystem/JAudio2/JAISound.hpp>
+#include <JSystem/JAudio2/JASSoundParams.hpp>
+#include <JSystem/JAudio2/JAUAudible.hpp>
+#include <JSystem/JAudio2/JAUSoundInfo.hpp>
+#include <JSystem/JGeometry/TUtil.hpp>
 #include <JSystem/JAudio2/JAIAudience.hpp>
 #include <JSystem/JAudio2/JAUAudience.hpp>
 #include <JSystem/JAudio2/JAUDoppler.hpp>

include/Game/AudioLib/AudBgm.hpp

@@ -2,7 +2,7 @@
 
 #include "Game/AudioLib/AudBgmRhythmStrategy.hpp"
 #include "Game/AudioLib/AudTrackController.hpp"
-#include "JSystem/JAudio2/JAISound.hpp"
+#include <JSystem/JAudio2/JAISound.hpp>
 
 class JAISoundID;
 class AudBgmVolumeController;

include/Game/AudioLib/AudMeNameConverter.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Game/Util/SingletonHolder.hpp"
-#include "JSystem/JAudio2/JAISound.hpp"
+#include <JSystem/JAudio2/JAISound.hpp>
 #include <revolution/types.h>
 
 struct AudMeNameData {

include/Game/AudioLib/AudSoundInfo.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JSystem/JAudio2/JAUStdSoundInfo.hpp"
+#include <JSystem/JAudio2/JAUStdSoundInfo.hpp>
 
 // TODO: JAUStdSoundInfo or just JAUSoundInfo?
 class AudSoundInfo : public JAUSoundInfo {

include/Game/AudioLib/AudSystem.hpp

@@ -3,9 +3,9 @@
 #include "Game/AudioLib/AudAudience.hpp"
 #include "Game/AudioLib/AudBgmMgr.hpp"
 #include "Game/AudioLib/AudLimitedSound.hpp"
-#include "JSystem/JAudio2/JAIAudible.hpp"
-#include "JSystem/JAudio2/JAIAudience.hpp"
-#include "JSystem/JAudio2/JAUStdSoundInfo.hpp"
+#include <JSystem/JAudio2/JAIAudible.hpp>
+#include <JSystem/JAudio2/JAIAudience.hpp>
+#include <JSystem/JAudio2/JAUStdSoundInfo.hpp>
 #include <JSystem/JAudio2/JASAudioReseter.hpp>
 #include <JSystem/JAudio2/JAUSoundMgr.hpp>
 #include <JSystem/JGeometry/TMatrix.hpp>

include/Game/Boss/BossStinkBug.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Game/LiveActor/LiveActor.hpp"
-#include "JSystem/JGeometry/TMatrix.hpp"
+#include <JSystem/JGeometry/TMatrix.hpp>
 
 class ActorCameraInfo;
 class ActorJointCtrl;

include/Game/Boss/BossStinkBugActionBase.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Game/LiveActor/ActorStateBase.hpp"
-#include "JSystem/JGeometry/TVec.hpp"
+#include <JSystem/JGeometry/TVec.hpp>
 
 class BossStinkBug;
 class HitSensor;

include/Game/Boss/BossStinkBugFunction.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "JSystem/JGeometry/TVec.hpp"
-#include "revolution/types.h"
+#include <JSystem/JGeometry/TVec.hpp>
+#include <revolution/types.h>
 
 class BossStinkBug;
 class HitSensor;

include/Game/Boss/DinoPackunBattleVs2Lv1.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Game/Boss/DinoPackunAction.hpp"
-#include "JSystem/JGeometry/TVec.hpp"
+#include <JSystem/JGeometry/TVec.hpp>
 
 class DinoPackunStateDamage;
 class DinoPackunTrackFireHolder;

include/Game/Boss/PoltaFunction.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JSystem/JGeometry/TVec.hpp"
+#include <JSystem/JGeometry/TVec.hpp>
 #include <revolution/types.h>
 
 class Polta;

include/Game/Boss/PoltaSensorCtrl.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "JSystem/JGeometry/TVec.hpp"
-#include "revolution/types.h"
+#include <JSystem/JGeometry/TVec.hpp>
+#include <revolution/types.h>
 
 class Polta;
 class HitSensor;

include/Game/Boss/SkeletalFishJointCalc.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JSystem/JGeometry/TMatrix.hpp"
+#include <JSystem/JGeometry/TMatrix.hpp>
 
 class SkeletalFishRailControl;
 class JointControllerInfo;

include/Game/Camera/CamHeliEffector.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "revolution/types.h"
+#include <revolution/types.h>
 
 class CameraMan;
 

include/Game/Camera/CamKarikariEffector.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "revolution.h"
+#include <revolution.h>
 
 class CameraMan;
 

include/Game/Camera/CameraContext.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Game/NameObj/NameObj.hpp"
-#include "JSystem/JGeometry.hpp"
+#include <JSystem/JGeometry.hpp>
 
 class CameraContext : public NameObj {
 public:

include/Game/Camera/CameraCover.hpp

@@ -2,7 +2,7 @@
 
 #include "Game/NameObj/NameObj.hpp"
 #include "Game/Screen/CaptureScreenDirector.hpp"
-#include "JSystem/JGeometry/TMatrix.hpp"
+#include <JSystem/JGeometry/TMatrix.hpp>
 
 class CameraCover : public NameObj {
 public:

include/Game/Camera/CameraDPD.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Game/Camera/Camera.hpp"
-#include "JSystem/JGeometry/TMatrix.hpp"
+#include <JSystem/JGeometry/TMatrix.hpp>
 
 class CameraDPD : public Camera {
 public:

include/Game/Camera/CameraDirector.hpp

@@ -2,7 +2,7 @@
 
 #include "Game/Camera/CameraHolder.hpp"
 #include "Game/NameObj/NameObj.hpp"
-#include "JSystem/JGeometry/TMatrix.hpp"
+#include <JSystem/JGeometry/TMatrix.hpp>
 
 class CameraCover;
 class CameraDirector;

include/Game/Camera/CameraManPause.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Game/Camera/CameraMan.hpp"
-#include "JSystem/JGeometry/TVec.hpp"
+#include <JSystem/JGeometry/TVec.hpp>
 
 class CameraManPause : public CameraMan {
 public:

include/Game/Camera/CameraShakePatternImpl.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JSystem/JGeometry/TVec.hpp"
+#include <JSystem/JGeometry/TVec.hpp>
 
 class CameraShakePattern {
 public:

include/Game/Camera/CameraTargetHolder.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "revolution.h"
+#include <revolution.h>
 
 class CameraTargetActor;
 class CameraTargetObj;

include/Game/Camera/CameraTargetMtx.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Game/Camera/CameraTargetObj.hpp"
-#include "JSystem/JGeometry/TMatrix.hpp"
+#include <JSystem/JGeometry/TMatrix.hpp>
 
 class CameraTargetMtx : public CameraTargetObj {
 public:

include/Game/Camera/CameraViewInterpolator.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JSystem/JGeometry.hpp"
+#include <JSystem/JGeometry.hpp>
 
 class CameraTargetObj;
 class Binder;

include/Game/Camera/DotCamParams.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "Game/Util/JMapInfo.hpp"
-#include "JSystem/JGeometry/TVec.hpp"
-#include "revolution.h"
+#include <JSystem/JGeometry/TVec.hpp>
+#include <revolution.h>
 
 class DotCamReader {
 public:

include/Game/Camera/GameCameraCreator.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "revolution.h"
+#include <revolution.h>
 
 class CameraParamChunkHolder;
 

include/Game/Demo/AstroDomeDemoStarter.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Game/LiveActor/LiveActor.hpp"
-#include "JSystem/JGeometry/TMatrix.hpp"
+#include <JSystem/JGeometry/TMatrix.hpp>
 
 class ActorCameraInfo;
 class SpinDriverShootPath;

include/Game/Demo/DemoPlayerKeeper.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Game/Demo/DemoExecutor.hpp>
+#include "Game/Demo/DemoExecutor.hpp"
 
 class DemoPlayerInfo {
 public:

include/Game/Effect/EffectSystemUtil.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JSystem/JGeometry/TMatrix.hpp"
+#include <JSystem/JGeometry/TMatrix.hpp>
 #include <revolution/types.h>
 
 class AutoEffectInfo;

include/Game/Enemy/AnimScaleController.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Game/System/NerveExecutor.hpp"
-#include "JSystem/JGeometry.hpp"
+#include <JSystem/JGeometry.hpp>
 
 class AnimScaleParam {
 public:

include/Game/Enemy/FireBall.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Game/LiveActor/LiveActor.hpp"
-#include "JSystem/JGeometry/TVec.hpp"
+#include <JSystem/JGeometry/TVec.hpp>
 
 class FireBall : public LiveActor {
 public:

include/Game/Enemy/HammerHeadPackun.hpp

@@ -2,7 +2,7 @@
 
 #include "Game/LiveActor/LiveActor.hpp"
 #include "Game/Util/JMapInfo.hpp"
-#include "JSystem/JGeometry/TVec.hpp"
+#include <JSystem/JGeometry/TVec.hpp>
 
 class PartsModel;
 class JointRumbler;

include/Game/Enemy/KoteBug.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Game/LiveActor/LiveActor.hpp"
-#include "JSystem/JGeometry.hpp"
+#include <JSystem/JGeometry.hpp>
 
 class AnimScaleController;
 class AnimStampController;

include/Game/Enemy/Kuribo.hpp

@@ -5,7 +5,7 @@
 #include "Game/LiveActor/HitSensor.hpp"
 #include "Game/LiveActor/LiveActor.hpp"
 #include "Game/Util/JMapInfo.hpp"
-#include "JSystem/JGeometry/TQuat.hpp"
+#include <JSystem/JGeometry/TQuat.hpp>
 
 class ItemGenerator;
 class WalkerStateStagger;

include/Game/Gravity/PlanetGravity.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JSystem/JGeometry.hpp"
+#include <JSystem/JGeometry.hpp>
 
 class NameObj;
 

include/Game/LiveActor/ActorJointCtrl.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JSystem/JGeometry/TVec.hpp"
+#include <JSystem/JGeometry/TVec.hpp>
 #include <revolution.h>
 
 class DynamicJointCtrlKeeper;

include/Game/LiveActor/DynamicJointCtrl.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JSystem/JGeometry.hpp"
+#include <JSystem/JGeometry.hpp>
 #include <revolution.h>
 
 class LiveActor;

include/Game/LiveActor/FaceJointCtrl.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JSystem/JGeometry.hpp"
+#include <JSystem/JGeometry.hpp>
 #include <revolution/types.h>
 
 class JointController;

include/Game/LiveActor/HitSensorInfo.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JSystem/JGeometry/TVec.hpp"
+#include <JSystem/JGeometry/TVec.hpp>
 #include <revolution.h>
 
 class HitSensor;

include/Game/LiveActor/HitSensorKeeper.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JSystem/JGeometry/TVec.hpp"
+#include <JSystem/JGeometry/TVec.hpp>
 #include <revolution.h>
 
 class HitSensor;

include/Game/LiveActor/MaterialCtrl.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
 #include "Game/Util/StringUtil.hpp"
-#include "JSystem/J3DGraphAnimator/J3DModelData.hpp"
-#include "JSystem/J3DGraphBase/J3DStruct.hpp"
-#include "JSystem/J3DGraphBase/J3DTexture.hpp"
-#include "JSystem/JUtility/JUTNameTab.hpp"
+#include <JSystem/J3DGraphAnimator/J3DModelData.hpp>
+#include <JSystem/J3DGraphBase/J3DStruct.hpp>
+#include <JSystem/J3DGraphBase/J3DTexture.hpp>
+#include <JSystem/JUtility/JUTNameTab.hpp>
 #include <revolution.h>
 
 class J3DTexMtx;

include/Game/LiveActor/ShadowVolumeFlatModel.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Game/LiveActor/ShadowVolumeModel.hpp"
-#include "JSystem/JGeometry/TMatrix.hpp"
+#include <JSystem/JGeometry/TMatrix.hpp>
 
 class J3DModelData;
 

include/Game/LiveActor/VolumeModelDrawer.hpp

@@ -2,7 +2,7 @@
 
 #include "Game/NameObj/NameObj.hpp"
 #include "Game/Util/Color.hpp"
-#include "JSystem/J3DGraphAnimator/J3DModelData.hpp"
+#include <JSystem/J3DGraphAnimator/J3DModelData.hpp>
 #include <revolution.h>
 
 class VolumeModelDrawer : public NameObj {

include/Game/Map/CollisionParts.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JSystem/JGeometry.hpp"
+#include <JSystem/JGeometry.hpp>
 #include <revolution.h>
 
 class CollisionZone;

include/Game/Map/HitInfo.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "Game/Util/JMapInfo.hpp"
-#include "JSystem/JGeometry/TMatrix.hpp"
-#include "JSystem/JGeometry/TVec.hpp"
+#include <JSystem/JGeometry/TMatrix.hpp>
+#include <JSystem/JGeometry/TVec.hpp>
 
 class CollisionParts;
 class HitSensor;

include/Game/Map/KCollision.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Game/Util/JMapInfo.hpp"
-#include "JSystem/JGeometry/TVec.hpp"
+#include <JSystem/JGeometry/TVec.hpp>
 #include <revolution.h>
 
 class JMapInfo;

include/Game/Map/LightFunction.hpp

@@ -2,7 +2,7 @@
 
 #include "Game/Map/LightDataHolder.hpp"
 #include "Game/Map/LightZoneDataHolder.hpp"
-#include "JSystem/JGeometry/TVec.hpp"
+#include <JSystem/JGeometry/TVec.hpp>
 #include <revolution.h>
 
 class JMapInfo;

include/Game/Map/LightPointCtrl.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Game/Util/Color.hpp"
-#include "revolution/gx/GXEnum.h"
+#include <revolution/gx/GXEnum.h>
 #include <JSystem/JGeometry.hpp>
 #include <revolution.h>
 

include/Game/Map/NamePosHolder.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Game/NameObj/NameObj.hpp"
-#include "JSystem/JGeometry/TVec.hpp"
+#include <JSystem/JGeometry/TVec.hpp>
 
 class JMapLinkInfo;
 

include/Game/Map/PlanetMap.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Game/LiveActor/LiveActor.hpp"
-#include "JSystem/JGeometry/TVec.hpp"
+#include <JSystem/JGeometry/TVec.hpp>
 
 class LodCtrl;
 class ModelObj;

include/Game/Map/RailGraph.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JSystem/JGeometry.hpp"
+#include <JSystem/JGeometry.hpp>
 #include <revolution.h>
 
 class RailGraphIter;

include/Game/Map/RailGraphNode.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JSystem/JGeometry.hpp"
+#include <JSystem/JGeometry.hpp>
 #include <revolution.h>
 
 class RailGraphNode {

include/Game/Map/RailPart.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JSystem/JGeometry/TVec.hpp"
+#include <JSystem/JGeometry/TVec.hpp>
 
 class LinearRailPart;
 class BezierRailPart;

include/Game/MapObj/ClipAreaDropLaser.hpp

@@ -3,7 +3,7 @@
 #include "Game/LiveActor/LiveActor.hpp"
 #include "Game/LiveActor/Nerve.hpp"
 #include "Game/Util/JMapInfo.hpp"
-#include "JSystem/JGeometry/TVec.hpp"
+#include <JSystem/JGeometry/TVec.hpp>
 #include <cstddef>
 
 class ClipAreaDropLaser : public LiveActor {

include/Game/MapObj/CollectCounter.hpp

@@ -2,7 +2,7 @@
 
 #include "Game/LiveActor/Nerve.hpp"
 #include "Game/Screen/LayoutActor.hpp"
-#include "JSystem/JGeometry.hpp"
+#include <JSystem/JGeometry.hpp>
 
 class CollectCounter : public LayoutActor {
 public:

include/Game/MapObj/DesertLandMoveSwitch.hpp

@@ -7,7 +7,7 @@
 #include "Game/MapObj/MapObjConnector.hpp"
 #include "Game/Util/JMapInfo.hpp"
 #include "Game/Util/SpringValue.hpp"
-#include "revolution/types.h"
+#include <revolution/types.h>
 
 class DesertLandMoveSwitch : public LiveActor {
 public:

include/Game/MapObj/DriftWood.hpp

@@ -2,8 +2,8 @@
 
 #include "Game/LiveActor/Nerve.hpp"
 #include "Game/MapObj/MapObjActor.hpp"
-#include "JSystem/JGeometry/TVec.hpp"
-#include "revolution/types.h"
+#include <JSystem/JGeometry/TVec.hpp>
+#include <revolution/types.h>
 
 class DriftWood : public MapObjActor {
 public:

include/Game/MapObj/HipDropTimerSwitch.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Game/LiveActor/LiveActor.hpp"
-#include "JSystem/JGeometry/TMatrix.hpp"
+#include <JSystem/JGeometry/TMatrix.hpp>
 
 class SpringValue;
 class MapObjConnector;

include/Game/MapObj/JumpStand.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Game/LiveActor/LiveActor.hpp"
-#include "JSystem/JGeometry/TMatrix.hpp"
+#include <JSystem/JGeometry/TMatrix.hpp>
 
 class JumpStand : public LiveActor {
 public:

include/Game/MapObj/OceanSmallTurtle.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Game/LiveActor/LiveActor.hpp"
-#include "JSystem/JGeometry/TMatrix.hpp"
+#include <JSystem/JGeometry/TMatrix.hpp>
 
 class MapPartsRailMover;
 class OceanSmallTurtle : public LiveActor {

include/Game/MapObj/PalmIsland.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Game/LiveActor/LiveActor.hpp"
-#include "JSystem/JGeometry/TVec.hpp"
+#include <JSystem/JGeometry/TVec.hpp>
 
 class PalmIsland : public LiveActor {
 public:

include/Game/MapObj/SpinDriverPathDrawer.hpp

@@ -2,7 +2,7 @@
 
 #include "Game/LiveActor/LiveActor.hpp"
 #include "Game/MapObj/SpinDriverShootPath.hpp"
-#include "JSystem/JUtility/JUTTexture.hpp"
+#include <JSystem/JUtility/JUTTexture.hpp>
 
 class SpinDriverPathDrawInit : public NameObj {
 public:

include/Game/MapObj/StarPiece.hpp

@@ -3,8 +3,8 @@
 #include "Game/LiveActor/LiveActor.hpp"
 #include "Game/Util/JMapInfo.hpp"
 #include "Game/Util/TriangleFilter.hpp"
-#include "JSystem/J3DGraphBase/J3DStruct.hpp"
-#include "JSystem/JGeometry/TVec.hpp"
+#include <JSystem/J3DGraphBase/J3DStruct.hpp>
+#include <JSystem/JGeometry/TVec.hpp>
 
 class HitSensor;
 // this function does not belong in this header, but will put here for now

include/Game/MapObj/StarPieceFollowGroup.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Game/LiveActor/LiveActor.hpp"
-#include "JSystem/JGeometry/TVec.hpp"
+#include <JSystem/JGeometry/TVec.hpp>
 
 class StarPiece;
 

include/Game/NPC/Butler.hpp

@@ -5,7 +5,7 @@
 #include "Game/NPC/TalkMessageCtrl.hpp"
 #include "Game/Util/JMapInfo.hpp"
 #include "Game/Util/NPCUtil.hpp"
-#include "revolution/types.h"
+#include <revolution/types.h>
 
 class Butler : public NPCActor {
 public:

include/Game/NPC/NPCFunction.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "revolution/types.h"
+#include <revolution/types.h>
 
 class NPCActorItem;
 

include/Game/NPC/NPCParameter.hpp

@@ -4,7 +4,7 @@
 #include "Game/NPC/NPCActorItem.hpp"
 #include "Game/Util/Array.hpp"
 #include "Game/Util/JMapInfo.hpp"
-#include "JSystem/JGeometry/TVec.hpp"
+#include <JSystem/JGeometry/TVec.hpp>
 
 class JMapInfo;
 class NPCActorItem;

include/Game/NPC/PowerStarEventKeeper.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JSystem/JGeometry/TVec.hpp"
+#include <JSystem/JGeometry/TVec.hpp>
 
 struct PowerStarInfo {
     bool _0;

include/Game/NPC/Rabbit.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "Game/NPC/NPCActor.hpp"
-#include "JSystem/JGeometry/TVec.hpp"
-#include "revolution/types.h"
+#include <JSystem/JGeometry/TVec.hpp>
+#include <revolution/types.h>
 
 class LodCtrl;
 class TalkMessageCtrl;

include/Game/NPC/Syati.hpp

@@ -7,7 +7,7 @@
 #include "Game/Map/RaceManager.hpp"
 #include "Game/NPC/TalkMessageCtrl.hpp"
 #include "Game/Util/JointController.hpp"
-#include "JSystem/JGeometry/TMatrix.hpp"
+#include <JSystem/JGeometry/TMatrix.hpp>
 #include <JSystem/JGeometry.hpp>
 
 class PlayerPoseSetterInWater;

include/Game/Player/FireMarioBall.hpp

@@ -3,8 +3,8 @@
 #include "Game/LiveActor/HitSensor.hpp"
 #include "Game/LiveActor/LiveActor.hpp"
 #include "Game/Util/JMapInfo.hpp"
-#include "JSystem/JGeometry/TVec.hpp"
-#include "revolution/types.h"
+#include <JSystem/JGeometry/TVec.hpp>
+#include <revolution/types.h>
 
 class FireMarioBall : public LiveActor {
 public:

include/Game/Player/GhostPacket.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JSystem/JGeometry/TVec.hpp"
+#include <JSystem/JGeometry/TVec.hpp>
 #include <revolution/types.h>
 
 class GhostPacket {

include/Game/Player/MarioSlider.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Game/Player/MarioState.hpp"
-#include "revolution/mtx.h"
+#include <revolution/mtx.h>
 
 class MarioActor;
 

include/Game/Player/ModelHolder.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "Game/LiveActor/LiveActor.hpp"
-#include "JSystem/JGeometry/TMatrix.hpp"
-#include "revolution/mtx.h"
+#include <JSystem/JGeometry/TMatrix.hpp>
+#include <revolution/mtx.h>
 
 class ModelHolder : public LiveActor {
 public:

include/Game/RhythmLib/AudMeSeqReader.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JSystem/JAudio2/JASSeqReader.hpp"
+#include <JSystem/JAudio2/JASSeqReader.hpp>
 
 class AudMeSeqReader {
 public:

include/Game/RhythmLib/AudMeTrack.hpp

@@ -3,9 +3,9 @@
 #include "Game/RhythmLib/AudMeChannelMgr.hpp"
 #include "Game/RhythmLib/AudMeSeqCtrl.hpp"
 #include "Game/RhythmLib/AudMeTrackCallback.hpp"
-#include "JSystem/JAudio2/JASBankTable.hpp"
-#include "JSystem/JAudio2/JASDSPInterface.hpp"
-#include "JSystem/JGadget/linklist.hpp"
+#include <JSystem/JAudio2/JASBankTable.hpp>
+#include <JSystem/JAudio2/JASDSPInterface.hpp>
+#include <JSystem/JGadget/linklist.hpp>
 #include <JSystem/JAudio2/JASHeapCtrl.hpp>
 #include <JSystem/JAudio2/JASOscillator.hpp>
 

include/Game/Screen/LayoutGroupCtrl.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Game/Util/Array.hpp"
-#include "revolution/types.h"
+#include <revolution/types.h>
 
 namespace nw4r {
     namespace lyt {

include/Game/System/DrawBufferExecuter.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "revolution.h"
+#include <revolution.h>
 
 class J3DModel;
 class LiveActor;

include/Game/System/FileLoader.hpp

@@ -3,9 +3,9 @@
 #include "Game/System/ArchiveHolder.hpp"
 #include "Game/System/FileHolder.hpp"
 #include "Game/System/FileLoaderThread.hpp"
-#include "JSystem/JKernel/JKRDvdRipper.hpp"
-#include "JSystem/JKernel/JKRHeap.hpp"
-#include "revolution.h"
+#include <JSystem/JKernel/JKRDvdRipper.hpp>
+#include <JSystem/JKernel/JKRHeap.hpp>
+#include <revolution.h>
 #include <cstdio>
 
 class JKRArchive;

include/Game/System/WPadAcceleration.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JSystem/JGeometry/TVec.hpp"
+#include <JSystem/JGeometry/TVec.hpp>
 #include <revolution.h>
 
 class WPad;

include/Game/Util/FurDrawer.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JSystem/JGeometry/TVec.hpp"
+#include <JSystem/JGeometry/TVec.hpp>
 #include <revolution.h>
 
 class DynamicFurParam;

include/Game/Util/FurShader.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "JSystem/J3DGraphAnimator/J3DModel.hpp"
-#include "revolution/gx/GXEnum.h"
+#include <JSystem/J3DGraphAnimator/J3DModel.hpp>
+#include <revolution/gx/GXEnum.h>
 #include <revolution.h>
 
 class J3DModel;

include/Game/Util/IKJoint.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JSystem/JGeometry.hpp"
+#include <JSystem/JGeometry.hpp>
 
 class IKJoint {
 public:

include/Game/Util/JMapUtil.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Game/Util/JMapInfo.hpp"
-#include "JSystem/JGeometry.hpp"
+#include <JSystem/JGeometry.hpp>
 #include <revolution.h>
 
 namespace MR {

include/Game/Util/JointController.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JSystem/JGeometry.hpp"
+#include <JSystem/JGeometry.hpp>
 #include <revolution.h>
 
 class J3DJoint;

include/Game/Util/LiveActorUtil.hpp

@@ -2,10 +2,10 @@
 
 #include "Game/Animation/AnmPlayer.hpp"
 #include "Game/Util/JMapInfo.hpp"
-#include "JSystem/J3DGraphBase/J3DStruct.hpp"
-#include "JSystem/JGeometry/TMatrix.hpp"
-#include "JSystem/JGeometry/TVec.hpp"
-#include "revolution/mtx.h"
+#include <JSystem/J3DGraphBase/J3DStruct.hpp>
+#include <JSystem/JGeometry/TMatrix.hpp>
+#include <JSystem/JGeometry/TVec.hpp>
+#include <revolution/mtx.h>
 #include <revolution.h>
 
 class ActorLightCtrl;

include/Game/Util/MathUtil.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "JSystem/JGeometry/TUtil.hpp"
-#include "JSystem/JMath/JMATrigonometric.hpp"
+#include <JSystem/JGeometry/TUtil.hpp>
+#include <JSystem/JMath/JMATrigonometric.hpp>
 #include <JSystem/JGeometry/TMatrix.hpp>
 #include <JSystem/JGeometry/TQuat.hpp>
 #include <JSystem/JGeometry/TVec.hpp>

include/Game/Util/MemoryUtil.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JSystem/JKernel/JKRHeap.hpp"
+#include <JSystem/JKernel/JKRHeap.hpp>
 #include <revolution/mem.h>
 
 class JKRExpHeap;

include/Game/Util/ModelUtil.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "JSystem/J3DGraphAnimator/J3DModel.hpp"
-#include "JSystem/J3DGraphAnimator/J3DModelData.hpp"
-#include "JSystem/JGeometry/TBox.hpp"
+#include <JSystem/J3DGraphAnimator/J3DModel.hpp>
+#include <JSystem/J3DGraphAnimator/J3DModelData.hpp>
+#include <JSystem/JGeometry/TBox.hpp>
 #include <revolution.h>
 
 class J3DModel;

include/Game/Util/MtxUtil.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "JSystem/JGeometry.hpp"
-#include "revolution/mtx.h"
+#include <JSystem/JGeometry.hpp>
+#include <revolution/mtx.h>
 #include <revolution.h>
 
 class LiveActor;

include/Game/Util/MutexHolder.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "revolution.h"
+#include <revolution.h>
 
 class JKRHeap;
 

include/Game/Util/ParabolicPath.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JSystem/JGeometry.hpp"
+#include <JSystem/JGeometry.hpp>
 
 class ParabolicPath {
 public:

include/Game/Util/PostureHolder.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JSystem/JGeometry/TVec.hpp"
+#include <JSystem/JGeometry/TVec.hpp>
 
 class LiveActor;
 

include/Game/Util/RailGraphUtil.hpp

@@ -3,7 +3,7 @@
 #include "Game/Map/RailGraphIter.hpp"
 #include "Game/Map/RailGraphNode.hpp"
 #include "Game/Util/JMapInfo.hpp"
-#include "JSystem/JGeometry/TVec.hpp"
+#include <JSystem/JGeometry/TVec.hpp>
 class RailGraphNodeSelecter {
 public:
     virtual bool isSatisfy(RailGraphIter& rIter) = 0;

include/Game/Util/RailUtil.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "JSystem/JGeometry.hpp"
-#include "JSystem/JGeometry/TBox.hpp"
+#include <JSystem/JGeometry.hpp>
+#include <JSystem/JGeometry/TBox.hpp>
 #include <revolution.h>
 
 class LiveActor;

include/Game/Util/RumbleCalculator.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JSystem/JGeometry.hpp"
+#include <JSystem/JGeometry.hpp>
 #include <revolution.h>
 
 class RumbleCalculator {

include/Game/Util/StarPointerUtil.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "JSystem/JGeometry.hpp"
+#include <JSystem/JGeometry.hpp>
 #include <revolution.h>
 
 class LayoutActor;