Replace int types in Retro code

Retro seemingly avoided using the Dolphin
typedefs in most places, opting to use int/uint
instead. This likely means they didn't use
u8/s8/u16/s16/etc either.


Former-commit-id: 133326ae40

include/MetroidPrime/ScriptObjects/CScriptMazeNode.hpp

@@ -82,7 +82,7 @@ public:
 
   void Accept(IVisitor& visitor) override;
   void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
-  void Think(f32 dt, CStateManager& mgr) override;
+  void Think(float dt, CStateManager& mgr) override;
 
   static void LoadMazeSeeds();
 
@@ -99,7 +99,7 @@ private:
   int xec_row;
   ESide xf0_side;
   TUniqueId xf4_gateEffectId;
-  f32 xf8_msgTimer;
+  float xf8_msgTimer;
   TUniqueId xfc_actorId;
   CVector3f x100_actorPos;
   TUniqueId x10c_triggerId;

include/MetroidPrime/ScriptObjects/CScriptPlatform.hpp

@@ -21,7 +21,7 @@ class CFluidPlane;
 
 struct SRiders {
   TUniqueId x0_uid;
-  f32 x4_decayTimer;
+  float x4_decayTimer;
   CTransform4f x8_transform;
 
   SRiders(TUniqueId uid)
@@ -33,8 +33,8 @@ class CScriptPlatform : public CPhysicsActor {
 public:
   CScriptPlatform(
       TUniqueId uid, const rstl::string& name, const CEntityInfo& info, const CTransform4f& xf,
-      const CModelData& mData, const CActorParameters& actParams, const CAABox& aabb, f32 speed,
-      bool detectCollision, f32 xrayAlpha, bool active, const CHealthInfo& hInfo,
+      const CModelData& mData, const CActorParameters& actParams, const CAABox& aabb, float speed,
+      bool detectCollision, float xrayAlpha, bool active, const CHealthInfo& hInfo,
       const CDamageVulnerability& dVuln,
       const rstl::optional_object< TLockedToken< CCollidableOBBTreeGroupContainer > >& dcln,
       bool rainSplashes, uint maxRainSplashes, uint rainGenRate);
@@ -42,8 +42,8 @@ public:
   // CEntity
   ~CScriptPlatform() override;
   void Accept(IVisitor& visitor) override;
-  void PreThink(f32 dt, CStateManager& mgr) override;
-  void Think(f32 dt, CStateManager& mgr) override;
+  void PreThink(float dt, CStateManager& mgr) override;
+  void Think(float dt, CStateManager& mgr) override;
   void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
 
   // CActor
@@ -73,8 +73,8 @@ public:
                        const CPhysicsActor* ridee, CStateManager& mgr);
   static TEntityList BuildNearListFromRiders(CStateManager& mgr,
                                              const rstl::vector< SRiders >& riders);
-  static void DecayRiders(rstl::vector< SRiders >& riders, f32 dt, CStateManager& mgr);
-  static void MoveRiders(CStateManager& mgr, f32 dt, bool active, rstl::vector< SRiders >& riders,
+  static void DecayRiders(rstl::vector< SRiders >& riders, float dt, CStateManager& mgr);
+  static void MoveRiders(CStateManager& mgr, float dt, bool active, rstl::vector< SRiders >& riders,
                          rstl::vector< SRiders >& collidedRiders, const CTransform4f& oldXf,
                          const CTransform4f& newXf, const CVector3f& dragDelta,
                          CQuaternion rotDelta);
@@ -82,11 +82,11 @@ public:
 private:
   TUniqueId x258_currentWaypoint;
   TUniqueId x25a_targetWaypoint;
-  f32 x25c_currentSpeed;
-  f32 x260_moveDelay;
-  f32 x264_collisionRecoverDelay;
-  f32 x268_fadeInTime;
-  f32 x26c_fadeOutTime;
+  float x25c_currentSpeed;
+  float x260_moveDelay;
+  float x264_collisionRecoverDelay;
+  float x268_fadeInTime;
+  float x26c_fadeOutTime;
   CVector3f x270_dragDelta;
   CQuaternion x27c_rotDelta;
   CHealthInfo x28c_initialHealth;
@@ -97,7 +97,7 @@ private:
   rstl::vector< SRiders > x318_riders;
   rstl::vector< SRiders > x328_slavesStatic;
   rstl::vector< SRiders > x338_slavesDynamic;
-  f32 x348_xrayAlpha;
+  float x348_xrayAlpha;
   uint x34c_maxRainSplashes;
   uint x350_rainGenRate;
   TUniqueId x354_boundsTrigger;

include/MetroidPrime/ScriptObjects/CScriptSpecialFunction.hpp

@@ -88,20 +88,20 @@ private:
   float x138_;
   CTransform4f x13c_spinnerInitialXf;
   float x16c_;
-  u16 x170_sfx1;
-  u16 x172_sfx2;
-  u16 x174_sfx3;
+  ushort x170_sfx1;
+  ushort x172_sfx2;
+  ushort x174_sfx3;
   CSfxHandle x178_sfxHandle;
   uint x17c_;
   float x180_;
-  TAverage< f32 > x184_;
+  TAverage< float > x184_;
   float x194_;
   rstl::vector< SRingController > x198_ringControllers;
   ERingState x1a8_ringState;
   CVector3f x1ac_ringRotateTarget;
   bool x1b8_ringReverse;
-  s32 x1bc_areaSaveId;
-  s32 x1c0_layerIdx;
+  int x1bc_areaSaveId;
+  int x1c0_layerIdx;
   CPlayerState::EItemType x1c4_item;
   rstl::optional_object< CAABox > x1c8_touchBounds;
   bool x1e4_24_spinnerInitializedXf : 1;
@@ -121,7 +121,7 @@ public:
   CScriptSpecialFunction(TUniqueId, const rstl::string&, const CEntityInfo&, const CTransform4f&,
                          ESpecialFunction, const rstl::string&, float, float, float, float,
                          const CVector3f&, const CColor&, bool, const CDamageInfo&, int, int,
-                         CPlayerState::EItemType, u16, u16, u16);
+                         CPlayerState::EItemType, ushort, ushort, ushort);
 
   void Accept(IVisitor& visitor) override;
   void Think(float, CStateManager&) override;
@@ -149,7 +149,7 @@ public:
 
   void DeleteEmitter(CSfxHandle& handle);
   int GetSpecialEnding(const CStateManager&) const;
-  void AddOrUpdateEmitter(float pitch, CSfxHandle& handle, u16 id, CVector3f pos, u8 vol);
+  void AddOrUpdateEmitter(float pitch, CSfxHandle& handle, ushort id, CVector3f pos, uchar vol);
 };
 
 #endif // _CSCRIPTSPECIALFUNCTION

include/MetroidPrime/ScriptObjects/CScriptSwitch.hpp

@@ -14,8 +14,8 @@ public:
   ~CScriptSwitch();
 
 private:
-  u8 mOpened;
-  u8 mCloseOnOpened;
+  uchar mOpened;
+  uchar mCloseOnOpened;
 };
 
 #endif // _CSCRIPTSWITCH

include/MetroidPrime/ScriptObjects/CScriptWaypoint.hpp

@@ -25,26 +25,26 @@ public:
   TUniqueId NextWaypoint(const CStateManager& mgr) const;
   void FollowWaypoint(const CStateManager& mgr) const;
 
-  f32 GetSpeed() const { return xe8_speed; }
+  float GetSpeed() const { return xe8_speed; }
   uint GetAnimation() const { return xec_animation; }
-  f32 GetPause() const { return xf0_pause; }
-  u8 GetPatternTranslate() const { return xf4_patternTranslate; }
-  u8 GetPatternOrient() const { return xf5_patternOrient; }
-  u8 GetPatternFit() const { return xf6_patternFit; }
-  u8 GetBehaviour() const { return xf7_behaviour; }
-  u8 GetBehaviourOrient() const { return xf8_behaviourOrient; }
-  u16 GetBehaviourModifiers() const { return xfa_behaviourModifiers; }
+  float GetPause() const { return xf0_pause; }
+  uchar GetPatternTranslate() const { return xf4_patternTranslate; }
+  uchar GetPatternOrient() const { return xf5_patternOrient; }
+  uchar GetPatternFit() const { return xf6_patternFit; }
+  uchar GetBehaviour() const { return xf7_behaviour; }
+  uchar GetBehaviourOrient() const { return xf8_behaviourOrient; }
+  ushort GetBehaviourModifiers() const { return xfa_behaviourModifiers; }
 
 private:
-  f32 xe8_speed;
+  float xe8_speed;
   uint xec_animation;
-  f32 xf0_pause;
-  u8 xf4_patternTranslate;
-  u8 xf5_patternOrient;
-  u8 xf6_patternFit;
-  u8 xf7_behaviour;
-  u8 xf8_behaviourOrient;
-  u16 xfa_behaviourModifiers;
+  float xf0_pause;
+  uchar xf4_patternTranslate;
+  uchar xf5_patternOrient;
+  uchar xf6_patternFit;
+  uchar xf7_behaviour;
+  uchar xf8_behaviourOrient;
+  ushort xfa_behaviourModifiers;
 };
 
 #endif // _CSCRIPTWAYPOINT