[DRAFT] Yamamoto/kartCtrlStrat

include/Sato/GeographyObj.h

@@ -297,14 +297,14 @@ class ExGeographyObj : public GeographyObj {
 
     ~ExGeographyObj() {}
     // TODO: check return types
-    virtual bool Search_Bound(const JGeometry::TVec3f &) { return false; }
-    virtual bool Search_BoundRadius(const JGeometry::TVec3f &, f32) { return false; }
-    virtual void Search(const JGeometry::TVec3f &, const JGeometry::TVec3f &) {}
-    virtual void AddVel(const JGeometry::TVec3f &, const JGeometry::TVec3f &) {}
-    virtual void Search_Wall(const JGeometry::TVec3f &, f32) { }
-    virtual void draw(Mtx) {}
-    virtual f32 getMaxHeight() const { return 0.0f; }
-    virtual void lockDisplayList() {}
+    virtual bool Search_Bound(const JGeometry::TVec3f &) { return false; }              // 80
+    virtual bool Search_BoundRadius(const JGeometry::TVec3f &, f32) { return false; }   // 84
+    virtual void Search(const JGeometry::TVec3f &, const JGeometry::TVec3f &) {}        // 88
+    virtual void AddVel(const JGeometry::TVec3f &, const JGeometry::TVec3f &) {}        // 8C
+    virtual void Search_Wall(const JGeometry::TVec3f &, f32) { }                        // 90
+    virtual void draw(Mtx) {}                                                           // 94
+    virtual f32 getMaxHeight() const { return 0.0f; }                                   // 98
+    virtual void lockDisplayList() {}                                                   // 9C
 
     template<class T>
     static T *ExNew(const CrsData::SObject &object) { return new T(object); }

include/Sato/JPEffectPerformer.h

@@ -21,8 +21,12 @@ class JPEffectPerformer
         Effect_UnknownF = 0xF,
         Effect_Unknown12 = 0x12,    // Star react.
         Effect_Burn = 0x13,
+        Effect_Unknown17 = 0x17,
+        Effect_Unknown1b = 0x1b,    // something slide related
+        Effect_Unknown1A = 0x1A,
         Effect_Star = 0x1c,
-        Effect_Fireball = 0x24,
+        Effect_Unknown23 = 0x23,
+        Effect_Fireball = 0x24
     };
 
     void init();                                                       // 80266010
@@ -34,7 +38,7 @@ class JPEffectPerformer
     void getNearestCamPtr(const JGeometry::TVec3f &);                  // 8026651c
     static void setEffect(EffectType, int, const JGeometry::TVec3f &, u8);    // 80266728
     void setEffectSplash(CrsGround *, int, const JGeometry::TVec3f &); // 80266858
-    void setEffectEachCam(EffectType, int, u8, u8);                    // 80266a8c
+    static void setEffectEachCam(EffectType, int, u8, u8);                    // 80266a8c
     void setLandEffect(const JGeometry::TVec3f &, CrsGround *, int);   // 80266bf0
     void getLandingEfctName(CrsGround *);                              // 80266d20
     void getKartEfctEmts(int);                                         // 80266dcc

include/Yamamoto/KartGame.h

@@ -11,7 +11,7 @@ class KartGame
 {
 public:
     // In kartCtrlStrat.cpp
-    void Init(int);
+    bool Init(int kartNo);
     void GetGorundTireNum();
     void WatchEffectAcceleration();
     void WatchAcceleration();
@@ -22,17 +22,17 @@ class KartGame
     void DoDriftTurboSterr();
     void SetDriftTurboSterr();
     void CheckDriftTurbo();
-    void DoWarmUpRoll();
+    f32 DoWarmUpRoll();
     void DoRollAnim();
     void DoDriftClear();
     void DoRoll();
     void DoTestPitch();
     void DoLiftTurbo();
     void DoTurbo();
     void DoRollThrow();
-    void DoRollOver();
+    int DoRollOver();
     void DoWanWan();
-    void DoPushStart();
+    bool DoPushStart();
     void DoBalance(f32 *, f32);
     void MakeClear();
     void MakeBoardDash();
@@ -54,7 +54,7 @@ class KartGame
     bool CheckBalloon();
     void SetRank();
     void RankWatchMan();
-    void ItemWatchMan(ItemObj *);
+    void ItemWatchMan(ItemObj *incomingItem);
     void AfterItemWatchMan();
     void DoFlagCtrl();
     void KeepWatch();
@@ -89,13 +89,21 @@ class KartGame
     // void FrameWorkL(f32, f32, KartSus *);
     // void DoTurboPower();
     // void CheckBalloonPlayer();
-    KartBody *mBody;
-    u8 _4[0x12 - 004];
-    u16 mCountDownDuration;
-    u8 _14[0x20 - 0x14];
+    KartBody *mBody; // 00
+    u32 _4;
+    u8 _8; // probably a bitmask
+    u8 _9;
+    u8 _A;
+    u8 mTimeToChange;
+    u8 _C[0x2];
+    u16 _E;
+    u16 _10;
+    u16 mCountDownDuration; // 12
+    ItemObj *mIncomingItem; // 14, the item that's about to collide with the kart
+    float _18[2];
     JGeometry::TVec3f _20;
     JGeometry::TVec3f _2C;
-    JGeometry::TVec3f _34;
+    JGeometry::TVec3f _38;
 };
 
 #endif KARTGAME_H

include/Yamamoto/KartRescue.h

@@ -31,12 +31,14 @@ class KartRescue
 
     // Inline/Unused
     // void DoHang();
-// private:
     u8 _0[0xc];            //
     CrsGround mGround;     // c
     u8 _6c[0x74 - 0x6c];   // padding up to offset 0x74
-    u8 mFlags;             // 74
-    u8 _75[0x8c - 0x75];   // remaining padding
+    u8 mFlags;             // 74 0x20: in rescue animation
+    u8 _75;
+    u8 mState;             // 0: no rescue 2: got out of course 3: lakitu holds us 4: lakitu lets us down
+    u8 _77;                // seems to be some kind of frame counter when getting rescued
+    u8 _78[0x8c - 0x78];   // remaining padding
     JGeometry::TVec3f _8c; //
     JGeometry::TVec3f _98; //
     JGeometry::TVec3f _a4; //

include/Yamamoto/kartBody.h

@@ -32,6 +32,36 @@
 class KartBody
 {
 public:
+    // TODO: move in KartGame
+    enum GameStatus {
+        HasCoDriver = 1<<0,
+        GsUnknown3 = 1<<3,
+    };
+
+    enum CarStatus {
+        DriftLeft = 1<<0,
+        DriftRight = 1<<1,
+        DoesSlide = 1<<2,
+        CsUnknown3 = 1<<3,
+        CsUnknown5 = 1<<5,
+        InDriverChange = 1<<7,
+        CsUnknown8 = 1<<8,
+        CsUnknown9 = 1<<9,
+        CsUnknown10 = 1<<10,
+        CsUnknown11 = 1<<11,
+        CsUnknown12 = 1<<12,
+        CsUnknown14 = 1<<14,
+        CsUnknown15 = 1<<15,
+        CsUnknown17 = 1<<17,
+        CsUnknown18 = 1<<18,
+        CsUnknown20 = 1<<20,
+        CsUnknown22 = 1<<22,
+        CsUnknown25 = 1<<25,
+        CsUnknown26 = 1<<26,
+        CsUnknown27 = 1<<27,
+        CsUnknown29 = 1<<29,
+    };
+
     KartBody() {}
 
     void DegubBody(u32);
@@ -102,7 +132,7 @@ class KartBody
     KartSus *mKartSus[4];
     ExModel *mBodyModel;
     DriverModel *mDriverModels[2];
-    ExModel *mExModels[2];
+    DriverModel *mExModels[2];
     KartShadowModel *mShadowModel;
     CrsGround mBodyGround;
     CrsArea mShadowArea;
@@ -285,7 +315,7 @@ class KartBody
     f32 _564;
     f32 _568;
     u8 _56c[4]; // padding?
-    u64 mCarStatus;  // 570, 574
+    u64 mCarStatus;  // 570, 574 | 0x400000: could be off track
     u32 mGameStatus; // 578
     u32 _57c;
     u32 _580;
@@ -311,7 +341,7 @@ class KartBody
     u8 mMynum;
     u8 _5b4;
     u8 _5b5; // also some timer
-    u8 _5b6; // dash timer?
+    u8 mSlideTimer; // dash timer?
     u8 mCameraNum;
     u8 _5b8[8];
     u8 _5c0;

include/Yamamoto/kartCtrl.h

@@ -97,7 +97,7 @@ class KartCtrl : public KartMat // WHAT THE HELL ARE YOU DOING
     double GetTireRadius(int);
     bool IsBurn(int);
     bool IsWallReact(int);
-    u32 HaveBalloon(int);
+    bool HaveBalloon(int);
     int GetDriftCnt(int);
     bool IsMiniGame();
     bool IsMiniGameEnd();

include/Yamamoto/kartSus.h

@@ -54,7 +54,7 @@ class KartSus
     f32 _10c;
     f32 _110;
     u8 _114[0x124 - 0x114];
-    u32 _124;
+    u32 _124; // bitmask? 0: on ground?
     Mtx _128;
     Mtx _158;
     Mtx _188;

src/Yamamoto/kartBody.cpp

@@ -1926,7 +1926,7 @@ void KartBody::Init(int index) {
     _5b0 = 0;
     _5b1 = 0;
     mDriver = 0;
-    _5b6 = 0;
+    mSlideTimer = 0;
     mMynum = 0;
     _5c5 = 0;
     _592 = 0;

src/Yamamoto/kartCtrlInfo.cpp

@@ -668,7 +668,7 @@ bool KartCtrl::IsWallReact(int kartIndex) {
     }
 }
 
-u32 KartCtrl::HaveBalloon(int kartIndex) {
+bool KartCtrl::HaveBalloon(int kartIndex) {
     getKartBody(kartIndex);
     return RCMGetKartChecker(kartIndex)->getBalloonNumber() == 0;
 }