start rest of challengeSelect2D

docs/recommended_todo.md

@@ -131,7 +131,7 @@
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/panModoki.cpp">panModoki.cpp</a> | 53591 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/umiMushi.cpp">umiMushi.cpp</a> | 58724 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/kingChappy.cpp">kingChappy.cpp</a> | 64580 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/hiScore2D.cpp">hiScore2D.cpp</a> | 103201 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/blackMan.cpp">blackMan.cpp</a> | 121218 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/zukan2D.cpp">zukan2D.cpp</a> | 133600 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/challengeResult2D.cpp">challengeResult2D.cpp</a> | 147116 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/challengeSelect2D.cpp">challengeSelect2D.cpp</a> | 186891 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/challengeResult2D.cpp">challengeResult2D.cpp</a> | 147116 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/challengeSelect2D.cpp">challengeSelect2D.cpp</a> | 185526 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/vsSelect2D.cpp">vsSelect2D.cpp</a> | 200915 |  |  |
 
 ### <section id="plugProjectNishimuraU">plugProjectNishimuraU</section>

include/Game/Data.h

@@ -58,7 +58,7 @@ struct PlayChallengeGameData {
 		}
 
 		BitFlag<u16> mFlags;      // _00
-		Highscore mHighscores[2]; // _04
+		Highscore mHighscores[2]; // _04, 0 = 1Player, 1 = 2Player
 	};
 
 	PlayChallengeGameData();

include/Game/gameChallenge2D.h

@@ -24,8 +24,8 @@ struct Challenge2D_TitleInfo {
 		int mSprayCounts[2];           // _04
 		int mTimeLimit;                // _0C
 		PikiContainer* mPikiContainer; // _10
-		Highscore* mHighscore1;        // _14
-		Highscore* mHighscore2;        // _18
+		Highscore* mHighscore1P;       // _14
+		Highscore* mHighscore2P;       // _18
 		u32 mStageIndex;               // _1C
 		BitFlag<u8> mDisplayFlag;      // _20
 	};

include/Morimura/challengeSelect2d.h

@@ -51,15 +51,17 @@ struct TChallengePlayModeScreen : public TScreenBase {
 	TChallengePlayModeScreen(JKRArchive*, int);
 
 	enum PlayModeScreenState {
-		PlayModeScreen_Open  = 1,
-		PlayModeScreen_Close = 3,
+		PlayModeScreen_Closed = 0,
+		PlayModeScreen_Open   = 1,
+		PlayModeScreen_Active = 2,
+		PlayModeScreen_Close  = 3,
 	};
 
 	virtual void create(const char*, u32);        // _08
 	virtual void update();                        // _0C
 	virtual void draw(Graphics&, J2DPerspGraph*); // _10
 
-	inline bool isActive(u8 state) const { return mState == state; }
+	inline bool isState(u8 state) const { return mState == state; }
 
 	// _00     = VTBL
 	// _00-_18 = TScreenBase
@@ -98,10 +100,10 @@ struct TChallengeSelect : public TTestBase {
 	TChallengeSelect();
 
 	struct DebugStageData {
-		u8 _00;           // _00
+		u8 mIsUnlocked;   // _00
 		u8 mIsChange;     // _01
-		u8 _02;           // _02
-		u8 _03;           // _03
+		u8 mIsComplete;   // _02
+		u8 mIsPerfect;    // _03
 		int mFloors;      // _04
 		int mSpicySpray;  // _08
 		int mBitterSpray; // _0C
@@ -188,7 +190,7 @@ struct TChallengeSelect : public TTestBase {
 	u32 mPikiCounts[5];                         // _108
 	u32 mDopeCount[2];                          // _11C
 	u32 mFloorCount;                            // _124
-	bool _128;                                  // _128
+	u8 mBgAlpha;                                // _128
 	int mStageChangeCounter;                    // _12C
 	int mMaxStages;                             // _130
 	u8 _134;                                    // _134

include/Morimura/mrUtil.h

@@ -284,15 +284,12 @@ struct TChallengePiki {
 	struct posInfo { // smh morimura why is this lower case
 		posInfo() { }
 
-		int mState;       // _00
-		f32 mTimer;       // _04
-		int _08;          // _08
-		f32 mCurrentXPos; // _0C
-		f32 mCurrentYPos; // _10
-		f32 mInitialXPos; // _14
-		f32 mInitialYPos; // _18
-		f32 mVelocityX;   // _1C
-		f32 mVelocityY;   // _20
+		int mState;           // _00
+		f32 mTimer;           // _04
+		int _08;              // _08
+		Vector2f mCurrentPos; // _0C
+		Vector2f mInitialPos; // _14
+		Vector2f mDeviation;  // _1C
 	};
 
 	enum PikiState {
@@ -314,7 +311,7 @@ struct TChallengePiki {
 	J2DPane* mPanes[3];   // _00
 	f32 mGoalXPos;        // _0C
 	f32 mGoalYPos;        // _10
-	Vector2f mVec[2];     // _14, I think these are actually pointers to something
+	Vector2f mVec[2];     // _14
 	posInfo mPosInfo[50]; // _24
 	int mMaxPiki;         // _72C
 	f32 mYOffset;         // _730

src/plugProjectKandoU/gameChallenge2D.cpp

@@ -24,8 +24,8 @@ Challenge2D_TitleInfo::Info::Info()
 	mSprayCounts[0] = 0;
 	mTimeLimit      = 0;
 	mPikiContainer  = nullptr;
-	mHighscore2     = nullptr;
-	mHighscore1     = nullptr;
+	mHighscore2P    = nullptr;
+	mHighscore1P    = nullptr;
 	mStageIndex     = 0;
 	mDisplayFlag.clear();
 }

src/plugProjectKandoU/vsGS_Title.cpp

@@ -124,8 +124,8 @@ void TitleState::dvdload()
 			displayData->mSprayCounts[0] = fileData->mStartNumBitter;
 			displayData->mSprayCounts[1] = fileData->mStartNumSpicy;
 			displayData->mPikiContainer  = &fileData->mPikiContainer;
-			displayData->mHighscore1     = &scores->mHighscores[0];
-			displayData->mHighscore2     = &scores->mHighscores[1];
+			displayData->mHighscore1P    = &scores->mHighscores[0];
+			displayData->mHighscore2P    = &scores->mHighscores[1];
 			displayData->mStageIndex     = fileData->mStageIndex;
 			displayData->mDisplayFlag.clear();