Adjustments from Eclipse

DotKuribo · Dec 15, 2024 · a02248d · a02248d
1 parent 0be99b4
commit a02248d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/include/SMS/Strategic/LiveActor.hxx b/include/SMS/Strategic/LiveActor.hxx
@@ -51,18 +51,18 @@ public:
     void setAnmSound(const char *);
     void initAnmSound();
     void getJointTransByIndex(int, TVec3f *) const;
-    void calcVelocityToJumpToY(const TVec3f &, f32, f32) const;
+    TVec3f calcVelocityToJumpToY(const TVec3f &, f32, f32) const;
     void initLodAnm(const TLodAnmIndex *, int, f32);
     J3DModel *getModel() const;
     void calcRideMomentum();
     void calcRidePos();
 
-    TLiveManager *mLiveManager;  // 0x0070
-    MActor *mActorData;          // 0x0074
-    TMActorKeeper *mActorKeeper; // 0x0078
-    u16 mActorIndex;       // _7C
-    MAnmSound *mAnmSound;  // _80
-    char *mBasName;        // _84
+    TLiveManager *mLiveManager;   // 0x0070
+    MActor *mActorData;           // 0x0074
+    TMActorKeeper *mActorKeeper;  // 0x0078
+    u16 mActorIndex;              // _7C
+    MAnmSound *mAnmSound;         // _80
+    char *mBasName;               // _84
     u32 *_88;
     TSpineBase<TLiveActor> *mSpineBase;  // 0x008C
     u32 _90;                             // 0x0090
@@ -72,7 +72,7 @@ public:
     f32 mShadowRadius;                   // 0x00B8
     f32 mMaxSpeed;                       // 0x00BC
     f32 _C0;                             // 0x00C0
-    TBGCheckData *mFloorBelow;           // 0x00C4
+    const TBGCheckData *mFloorBelow;     // 0x00C4
     f32 mGroundY;                        // 0x00C8
     f32 mGravity;                        // 0x00CC
     u32 _D0;
@@ -101,5 +101,5 @@ public:
             u32 _06             : 3;
             bool mIsObjDead     : 1;
         } asFlags;
-    } mStateFlags; // _F0
+    } mStateFlags;
 };
diff --git a/include/SMS/System/MarDirector.hxx b/include/SMS/System/MarDirector.hxx
@@ -50,7 +50,7 @@ public:
     void setMario();
     void currentStateFinalize(u8);
     s32 changeState();
-    void fireStreamingMovie(s8);
+    void fireStreamingMovie(u8);
     void fireEndDemoCamera();
     void fireStartDemoCamera(const char *, const TVec3f *, s32, f32, bool, s32 (*)(u32, u32), u32,
                              JDrama::TActor *, JDrama::TFlagT<u16>);
@@ -72,8 +72,8 @@ public:
     s32 setup(JDrama::TDisplay *, TMarioGamePad **, u8 areaID, u8 episodeID);
 
     TMarioGamePad **mGamePads;
-    TPerformList *mPerformListGX;          // 0x001c
-    TPerformList *mPerformListSilhouette;  // 0x0020
+    TPerformList *mPerformListGX;
+    TPerformList *mPerformListSilhouette;
     TPerformList *mPerformListGXPost;      // 0x0024
     TPerformList *mPerformListMovement;    // 0x0028
     TPerformList *mPerformListCalcAnim;    // 0x002C