Match and link J2DManager

configure.py

@@ -1080,7 +1080,7 @@ def MatchingFor(*versions):
         [
             Object(NonMatching, "Kameda/Motor.cpp"),
             Object(NonMatching, "Kameda/MotorManager.cpp"),
-            Object(NonMatching, "Kameda/J2DManager.cpp"),
+            Object(Matching, "Kameda/J2DManager.cpp"),
             Object(Matching, "Kameda/Task.cpp"),
             Object(NonMatching, "Kameda/Goal2D.cpp"),
             Object(NonMatching, "Kameda/PauseManager.cpp"),

include/Kameda/Demo2D.h

@@ -29,6 +29,8 @@ class Demo2D {
     void draw();           // 0x801832d0
     void calc();           // 0x80183344
 
+    void reset() { init(); }
+
     // Inline/Unused
     ~Demo2D();
 

include/Kameda/Go2D.h

@@ -29,5 +29,12 @@ class Go2D { // Autogenerated
     void calc();     // 0x8016ed58
     // Inline/Unused
     ~Go2D();
+
+    void reset() { init(); }
+    void setDrawFlag(bool enable) { mDrawFlag = enable; }
+private:
+    PLACEHOLDER_BYTES(0, 0x30);
+    bool mDrawFlag; // 30
+    PLACEHOLDER_BYTES(0x31, 0x34);
 }; // class Go2D
 #endif // GO2D_H

include/Kameda/Go3212D.h

@@ -22,12 +22,20 @@ class Go3212DHioNode : public HioNode {
 };
 
 class Go3212D { // Autogenerated
-    // Global
+public:
     Go3212D(JKRHeap *); // 0x80183460
     void init(); // 0x801835f8
     void draw(); // 0x80183680
     void calc(); // 0x8018372c
     // Inline/Unused
     ~Go3212D();
+
+    void reset() { init(); }
+    bool isStart() { return mIsStart; }
+    void start() { mIsStart = true; }
+private:
+    PLACEHOLDER_BYTES(0, 0x24);
+    bool mIsStart;
+    PLACEHOLDER_BYTES(0x25, 0x28);
 }; // class Go3212D
 #endif // GO3212D_H

include/Kameda/Goal2D.h

@@ -37,5 +37,12 @@ class Goal2D { // Autogenerated
     static bool mDrawEndFlag; // 0x80416290
     // Inline/Unused
     ~Goal2D();
+
+    void reset() { init(); }
+    int getAnmFrame(int status) const { return mAnmFrame[status*4]; }
+private:
+    PLACEHOLDER_BYTES(0, 0xb0);
+    int mAnmFrame[4]; // b0 TODO: check size/is this part of a sub struct
+    PLACEHOLDER_BYTES(0xc0, 0xec);
 }; // class Goal2D
 #endif // GOAL2D_H

include/Kameda/J2DManager.h

@@ -34,11 +34,11 @@ class J2DManager
     int getPreRaceWipeType();       // 0x80132064
     void setRace2DDrawFlag(bool);   // 0x80132070
     void hideRace2D();              // 0x80132084
-    void getHideFrameRace2D();      // 0x80132094
+    int getHideFrameRace2D();       // 0x80132094
     bool isHideRace2D();            // 0x801320a0
     bool isRaceEnd();               // 0x801320c0
     bool isGoalAnmEnd(int);         // 0x80132120
-    void getGoalAnmFrame(int);      // 0x801321b0
+    int getGoalAnmFrame(int);       // 0x801321b0
     bool isAlarm(int);              // 0x801321c4
     void startLANNumAnm();          // 0x801321e8
     void startLANNumResultAnm();    // 0x8013220c
@@ -62,19 +62,20 @@ class J2DManager
 
     static char *mKartNumberName[8]; // 0x80394378
     static int mKart2Status[8];      // 0x803fb9a0
-    static int mStatus2Kart[8];      // 0x803fba10
+    static int mStatus2Kart[4];      // 0x803fba10
     static J2DManager *mThis;        // 0x80416288
     static bool mNetFlag;            // 0x8041628c
 
     JKRArchive *mArchive;
     J2DOrthoGraph *mOrtho;
     bool mDrawFlag;
     bool mInit;
+    bool _a;
     int mAnmFrame;
     bool mWinnerAnmFlag[8];
     bool mLoserAnmFlag[8];
     int mDuration;
-    Demo2D *mDemo2D;
+    Demo2D *mDemo;
     PreRace2D *mPreRace;
     Go3212D *mGo321;
     Go2D *mGo;

include/Kameda/LANNum2D.h

@@ -34,5 +34,9 @@ class LANNum2D { // Autogenerated
     void start2(); // 0x80197c88
     // Inline/Unused
     ~LANNum2D();
+
+    void reset() { init(); }
+private:
+    PLACEHOLDER_BYTES(0, 0x10c);
 }; // class LANNum2D
 #endif // LANNUM2D_H

include/Kameda/LANResult2D.h

@@ -30,5 +30,9 @@ class LANResult2D { // Autogenerated
     void start(int); // 0x80195664
     // Inline/Unused
     ~LANResult2D();
+
+    void reset() { init(); }
+private:
+    PLACEHOLDER_BYTES(0, 0x1c);
 }; // class LANResult2D
 #endif // LANRESULT2D_H

include/Kameda/PauseManager.h

@@ -27,6 +27,8 @@ class PauseManager {
         return mThis;
     }
 
+    bool isResultStart() const { return mResultStart; }
+
 private:
     static PauseManager *mThis;    // 0x80416298
     static bool mIsPause;          // 0x8041629c

include/Kameda/PreRace2D.h

@@ -5,6 +5,7 @@
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JORReflexible.h"
 #include "Kaneshige/HioMgr.h"
+#include "macros.h"
 
 class PreRace2DParam : public JORReflexible {
 public:
@@ -40,5 +41,14 @@ class PreRace2D { // Autogenerated
     static const u64 mPreRaceBckTag[2]; // 0x80371070
     // Inline/Unused
     ~PreRace2D();
+
+    int getStatus() const { return mStatus; }
+    int getWipeType() const { return mWipeType; }
+private:
+    PLACEHOLDER_BYTES(0, 0x24);
+    int mStatus; // 24
+    PLACEHOLDER_BYTES(0x28, 0x2c);
+    int mWipeType; // 2c
+    PLACEHOLDER_BYTES(0x30, 0xe0);
 }; // class PreRace2D
 #endif // PRERACE2D_H

include/Kameda/Race2D.h

@@ -60,7 +60,7 @@ class Race2D
     void setEscapeColor(int);                                                                     // 0x80161894
     void getTimeColor(JUTColor, JUTColor);                                        // 0x80162844
     void startBombDemo();                                                                         // 0x801629bc
-    void isAlarm(int);                                                                            // 0x801629e0
+    bool isAlarm(int);                                                                            // 0x801629e0
     void getMapPos(int, JGeometry::TVec3f &, JGeometry::TVec2f &);                    // 0x80162a40
     void getCharacterInfo(int, int, f32 &, f32 &, f32 &);                                   // 0x80162dac
     void getCharacterClr(int, int, int, JUTColor &, JUTColor &, u8 &); // 0x80162ec8
@@ -124,9 +124,23 @@ class Race2D
     static Task *mTask;                                                                             // 0x80416304
     // Inline/Unused
     ~Race2D();
-    void getItemPos(int, int, JGeometry::TVec2<f32> &);
+    void getItemPos(int, int, JGeometry::TVec2f &);
     void itemUseInit();
     void itemUseMain();
+
+    void reset() { init(); }
+    void hide() { mHideFrame = 1; }
+
+    int getHideFrame() const { return mHideFrame; }
+    void setDrawFlag(bool enable) { mDrawFlag = enable; }
+
+    void endBombDemo() { mIsEndBombDemo = true; }
+private:
+    PLACEHOLDER_BYTES(0, 0x4ebc);
+    int mHideFrame;  // 4ebc
+    bool mDrawFlag; // 4ec0
+    bool mIsEndBombDemo; // 4ec1
+    PLACEHOLDER_BYTES(0x4ec2, 0x4ec4);
 };
 
 #endif // RACE2D_H