did NOT Link khFinalFloor.cpp

docs/recommended_todo.md

@@ -91,7 +91,7 @@
 ### <section id="plugProjectEbisawaU">plugProjectEbisawaU</section>
 | File | Size (bytes) | File | Size (bytes) |
 | ---- | ---- | ---- | ---- |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/ebiUtility.cpp">ebiUtility.cpp</a> | 3537 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/ebiGeometry.cpp">ebiGeometry.cpp</a> | 5821 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/ebiUtility.cpp">ebiUtility.cpp</a> | 3508 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/ebiGeometry.cpp">ebiGeometry.cpp</a> | 5821 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/ebiCardEReader.cpp">ebiCardEReader.cpp</a> | 13664 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/ebiFileSelectMgr.cpp">ebiFileSelectMgr.cpp</a> | 14258 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/efx2dEffect.cpp">efx2dEffect.cpp</a> | 17805 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/efxObject.cpp">efxObject.cpp</a> | 18283 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/particle2dMgr.cpp">particle2dMgr.cpp</a> | 18589 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/ebi2DGraph.cpp">ebi2DGraph.cpp</a> | 19236 |
@@ -140,8 +140,8 @@
 ### <section id="plugProjectKonoU">plugProjectKonoU</section>
 | File | Size (bytes) | File | Size (bytes) |
 | ---- | ---- | ---- | ---- |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khWinLoseReason.cpp">khWinLoseReason.cpp</a> | 21744 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khWinLose.cpp">khWinLose.cpp</a> | 22507 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khFinalFloor.cpp">khFinalFloor.cpp</a> | 6204 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khWinLoseReason.cpp">khWinLoseReason.cpp</a> | 21744 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khReadyGo.cpp">khReadyGo.cpp</a> | 25825 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khFinalFloor.cpp">khFinalFloor.cpp</a> | 26041 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khWinLose.cpp">khWinLose.cpp</a> | 22507 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khReadyGo.cpp">khReadyGo.cpp</a> | 25825 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khUtil.cpp">khUtil.cpp</a> | 26990 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khPayDept.cpp">khPayDept.cpp</a> | 27871 |
 
 ### <section id="plugProjectMorimuraU">plugProjectMorimuraU</section>

include/Screen/screenMgr.h

@@ -71,7 +71,7 @@ struct Mgr : public MgrBase {
 	CNode m_sceneInfoList;      // _78, treat as SceneInfoList
 	u8 _90;                     // _90
 	bool m_inCave;              // _91
-	u8 _92;                     // _92
+	bool m_inDemo;              // _92
 	u32 _94;                    // _94
 	u32 _98;                    // _98
 	JUtility::TColor m_bgColor; // _9C

include/kh/FinalFloor.h

@@ -6,6 +6,9 @@
 #include "og/Screen/callbackNodes.h"
 #include "Screen/screenObj.h"
 #include "P2DScreen.h"
+#include "utilityU.h"
+#include "PSSystem/PSGame.h"
+#include "PSSystem/PSMainSide_Scene.h"
 
 struct JAISound;
 
@@ -19,10 +22,29 @@ struct DispFinalFloor : public og::Screen::DispMemberBase {
 
 	// _00     = VTBL
 	// _00-_08 = DispMemberBase
-	u8 _08; // _08
+	bool m_is2Player; // _08
 };
 
 struct ObjFinalFloor : public ::Screen::ObjBase {
+	ObjFinalFloor()
+	{
+		m_screen[0]     = nullptr;
+		m_anim1[0]      = nullptr;
+		m_anim2[0]      = nullptr;
+		m_animTimer2[0] = 0.0f;
+		m_animTimer1[0] = 0.0f;
+		m_letterYPos[0] = 0.0f;
+
+		m_screen[1]     = nullptr;
+		m_anim1[1]      = nullptr;
+		m_anim2[1]      = nullptr;
+		m_animTimer2[1] = 0.0f;
+		m_animTimer1[1] = 0.0f;
+		m_letterYPos[1] = 0.0f;
+
+		m_lines = 1;
+		m_sound = nullptr;
+	}
 
 	virtual ~ObjFinalFloor();             // _08 (weak)
 	virtual void doCreate(JKRArchive*);   // _4C
@@ -32,22 +54,44 @@ struct ObjFinalFloor : public ::Screen::ObjBase {
 	virtual void doUpdateFadeoutFinish(); // _64
 	virtual void doDraw(Graphics& gfx);   // _68
 
-	void updateAnimation();
+	bool updateAnimation();
 	void stopSound();
 	void restartSound();
 
+	inline void startBGM()
+	{
+		PSStart2DStream(0xc0011025);
+		PSSystem::SceneMgr* mgr = PSSystem::getSceneMgr();
+		PSSystem::checkSceneMgr(mgr);
+		PSM::Scene_Game* scene = static_cast<PSM::Scene_Game*>(mgr->getChildScene());
+		PSSystem::checkGameScene(scene);
+		scene->onStartMainSeq();
+	}
+
 	// _00     = VTBL1
 	// _18     = VTBL2
 	// _00-_38 = Screen::ObjBase
-	P2DScreen::Mgr_tuning* _38[2]; // _38
+	P2DScreen::Mgr_tuning* m_screen[2]; // _38
-	J2DAnmTransform* _40[2];       // _40
+	J2DAnmTransform* m_anim1[2];        // _40
-	J2DAnmColor* _48[2];           // _48
+	J2DAnmColor* m_anim2[2];            // _48
-	f32 _50[2];                    // _50
+	f32 m_animTimer1[2];                // _50
-	f32 _58[2];                    // _58
+	f32 m_animTimer2[2];                // _58
-	f32 _60;                       // _60
+	f32 m_letterYPos[2];                // _60
-	f32 _64;                       // _64
+	int m_lines;                        // _68
-	int _68;                       // _68
+	JAISound* m_sound;                  // _6C
-	JAISound* m_sound;             // _6C
+
+	static struct StaticValues {
+		inline StaticValues()
+		{
+			_04 = -120.0f;
+			_08 = 120.0f;
+			_00 = 0.8f;
+		}
+
+		f32 _00; // _00
+		f32 _04; // _04
+		f32 _08; // _08
+	} msVal;
 };
 
 struct SceneFinalFloor : public ::Screen::SceneBase {

include/og/newScreen/Challenge.h

@@ -364,11 +364,17 @@ struct ObjChallenge2P : public ObjChallengeBase {
 };
 
 struct SArgChallengeBase : public ::Screen::StartSceneArg {
+	SArgChallengeBase(f32 data) { _04 = data; }
+
 	// _00     = VTBL
 	f32 _04; // _04
 };
 
 struct SArgChallenge1P : public SArgChallengeBase {
+	SArgChallenge1P(f32 data)
+	    : SArgChallengeBase(data)
+	{
+	}
 	virtual SceneType getSceneType() const; // _08 (weak)
 	virtual int getClassSize();             // _0C (weak)
 
@@ -377,6 +383,11 @@ struct SArgChallenge1P : public SArgChallengeBase {
 };
 
 struct SArgChallenge2P : public SArgChallengeBase {
+	SArgChallenge2P(f32 data)
+	    : SArgChallengeBase(data)
+	{
+	}
+
 	virtual SceneType getSceneType() const; // _08 (weak)
 	virtual int getClassSize();             // _0C (weak)