Standardize include guards, clang-format headers

Former-commit-id: 261ee48bba

include/MetroidPrime/ScriptObjects/CFire.hpp

@@ -1,8 +1,9 @@
-#ifndef __CFIRE_HPP__
-#define __CFIRE_HPP__
+#ifndef _CFIRE
+#define _CFIRE
+
+#include "types.h"
 
 #include "MetroidPrime/CActor.hpp"
-
 #include "MetroidPrime/CDamageInfo.hpp"
 
 #include "Kyoto/Particles/CElementGen.hpp"
@@ -38,4 +39,4 @@ private:
   float x15c_;
 };
 
-#endif // __CFIRE_HPP__
+#endif // _CFIRE

include/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.hpp

@@ -1,5 +1,5 @@
-#ifndef _CSCRIPTDEBUGCAMERAWAYPOINT_HPP
-#define _CSCRIPTDEBUGCAMERAWAYPOINT_HPP
+#ifndef _CSCRIPTDEBUGCAMERAWAYPOINT
+#define _CSCRIPTDEBUGCAMERAWAYPOINT
 
 #include "types.h"
 
@@ -17,4 +17,4 @@ private:
   uint xe8_value;
 };
 
-#endif
+#endif // _CSCRIPTDEBUGCAMERAWAYPOINT

include/MetroidPrime/ScriptObjects/CScriptMazeNode.hpp

@@ -1,5 +1,5 @@
-#ifndef _CSCRIPTMAZENODE_HPP
-#define _CSCRIPTMAZENODE_HPP
+#ifndef _CSCRIPTMAZENODE
+#define _CSCRIPTMAZENODE
 
 #include "types.h"
 
@@ -118,4 +118,4 @@ private:
   static uint sMazeSeeds[300];
 };
 
-#endif
+#endif // _CSCRIPTMAZENODE

include/MetroidPrime/ScriptObjects/CScriptPickup.hpp

@@ -1,5 +1,5 @@
-#ifndef _CSCRIPTPICKUP_HPP
-#define _CSCRIPTPICKUP_HPP
+#ifndef _CSCRIPTPICKUP
+#define _CSCRIPTPICKUP
 
 #include "types.h"
 
@@ -43,4 +43,4 @@ public:
   void SetSpawned();
 };
 
-#endif // _CSCRIPTPICKUP_HPP
+#endif // _CSCRIPTPICKUP

include/MetroidPrime/ScriptObjects/CScriptPlatform.hpp

@@ -1,5 +1,5 @@
-#ifndef _CSCRIPTPLATFORM_HPP
-#define _CSCRIPTPLATFORM_HPP
+#ifndef _CSCRIPTPLATFORM
+#define _CSCRIPTPLATFORM
 
 #include "types.h"
 
@@ -112,4 +112,4 @@ private:
 };
 CHECK_SIZEOF(CScriptPlatform, 0x358)
 
-#endif
+#endif // _CSCRIPTPLATFORM

include/MetroidPrime/ScriptObjects/CScriptSpecialFunction.hpp

@@ -1,5 +1,5 @@
-#ifndef _CSCRIPTSPECIALFUNCTION_HPP
-#define _CSCRIPTSPECIALFUNCTION_HPP
+#ifndef _CSCRIPTSPECIALFUNCTION
+#define _CSCRIPTSPECIALFUNCTION
 
 #include "MetroidPrime/CActor.hpp"
 #include "MetroidPrime/CDamageInfo.hpp"
@@ -116,6 +116,7 @@ private:
   bool x1e5_25_playerInArea : 1;
   bool x1e5_26_displayBillboard : 1;
   rstl::optional_object< CToken > x1e8_;
+
 public:
   CScriptSpecialFunction(TUniqueId, const rstl::string&, const CEntityInfo&, const CTransform4f&,
                          ESpecialFunction, const rstl::string&, float, float, float, float,
@@ -151,4 +152,4 @@ public:
   void AddOrUpdateEmitter(float pitch, CSfxHandle& handle, u16 id, CVector3f pos, u8 vol);
 };
 
-#endif _CSCRIPTSPECIALFUNCTION_HPP
+#endif // _CSCRIPTSPECIALFUNCTION

include/MetroidPrime/ScriptObjects/CScriptSwitch.hpp

@@ -1,5 +1,7 @@
-#ifndef __CSCRIPTSWITCH_HPP__
-#define __CSCRIPTSWITCH_HPP__
+#ifndef _CSCRIPTSWITCH
+#define _CSCRIPTSWITCH
+
+#include "types.h"
 
 #include "MetroidPrime/CEntity.hpp"
 
@@ -16,4 +18,4 @@ private:
   u8 mCloseOnOpened;
 };
 
-#endif // __CSCRIPTSWITCH_HPP__
+#endif // _CSCRIPTSWITCH

include/MetroidPrime/ScriptObjects/CScriptWaypoint.hpp

@@ -1,5 +1,5 @@
-#ifndef _CSCRIPTWAYPOINT_HPP
-#define _CSCRIPTWAYPOINT_HPP
+#ifndef _CSCRIPTWAYPOINT
+#define _CSCRIPTWAYPOINT
 
 #include "types.h"
 
@@ -47,4 +47,4 @@ private:
   u16 xfa_behaviourModifiers;
 };
 
-#endif
+#endif // _CSCRIPTWAYPOINT