Link newGame2DMgr.cpp

Co-Authored-By: EpochFlame <82550703+EpochFlame@users.noreply.github.com>

docs/recommended_todo.md

@@ -142,7 +142,8 @@
 | File | Size (bytes) | File | Size (bytes) |
 | ---- | ---- | ---- | ---- |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khPayDept.cpp">khPayDept.cpp</a> | 9836 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khUtil.cpp">khUtil.cpp</a> | 11500 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/newScreenMgr.cpp">newScreenMgr.cpp</a> | 15982 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/newGame2DMgr.cpp">newGame2DMgr.cpp</a> | 44598 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/newScreenMgr.cpp">newScreenMgr.cpp</a> | 15982 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khCaveResult.cpp">khCaveResult.cpp</a> | 67021 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khFinalResult.cpp">khFinalResult.cpp</a> | 90985 |
 
 ### <section id="plugProjectMorimuraU">plugProjectMorimuraU</section>
 | File | Size (bytes) | File | Size (bytes) |

obj_files.mk

@@ -1109,7 +1109,7 @@ KONO:=\
 	$(BUILD_DIR)/asm/plugProjectKonoU/khWorldMap.o\
 	$(BUILD_DIR)/asm/plugProjectKonoU/khCaveResult.o\
 	$(BUILD_DIR)/src/plugProjectKonoU/khSceneLoader.o\
-	$(BUILD_DIR)/asm/plugProjectKonoU/newGame2DMgr.o\
+	$(BUILD_DIR)/src/plugProjectKonoU/newGame2DMgr.o\
 	$(BUILD_DIR)/asm/plugProjectKonoU/newScreenMgr.o\
 	$(BUILD_DIR)/src/plugProjectKonoU/khReadyGo.o\
 	$(BUILD_DIR)/src/plugProjectKonoU/khFinalFloor.o\

src/plugProjectOgawaU/ogObjChallenge1P.cpp

@@ -248,9 +248,9 @@ void ObjChallenge1P::doUpdateFadeoutFinish() { }
 bool ObjChallenge1P::doStart(::Screen::StartSceneArg const* arg)
 {
 	ObjChallengeBase::doStart(arg);
-	SArgChallenge1P* challArg = static_cast<SArgChallenge1P*>((::Screen::StartSceneArg*)(arg));
-	if (challArg && challArg->getSceneType() == SCENE_CHALLENGE_1P) {
-		m_incTimeLeftDelay = (challArg->_04);
+	if (arg && arg->getSceneType() == SCENE_CHALLENGE_1P) {
+		SArgChallenge1P* challArg = static_cast<SArgChallenge1P*>((::Screen::StartSceneArg*)(arg));
+		m_incTimeLeftDelay        = (challArg->_04);
 	} else {
 		m_incTimeLeftDelay = 0.0f;
 	}

src/plugProjectOgawaU/ogObjChallenge2P.cpp

@@ -293,9 +293,9 @@ bool ObjChallenge2P::doUpdateFadeout()
 bool ObjChallenge2P::doStart(::Screen::StartSceneArg const* arg)
 {
 	ObjChallengeBase::doStart(arg);
-	SArgChallenge2P* challArg = static_cast<SArgChallenge2P*>((::Screen::StartSceneArg*)(arg));
-	if (challArg && challArg->getSceneType() == SCENE_CHALLENGE_2P) {
-		m_incTimeLeftDelay = (challArg->_04);
+	if (arg && arg->getSceneType() == SCENE_CHALLENGE_2P) {
+		SArgChallenge2P* challArg = static_cast<SArgChallenge2P*>((::Screen::StartSceneArg*)(arg));
+		m_incTimeLeftDelay        = (challArg->_04);
 	} else {
 		m_incTimeLeftDelay = 0.0f;
 	}

tools/progress.csv

@@ -353,3 +353,5 @@ You have 1840 out of 10000 Pokos and 61 out of 201 treasures.",2023-01-21 09:29:
 You have 1841 out of 10000 Pokos and 61 out of 201 treasures.",2023-01-21 22:40:42.156306
 1844,858348,0.18449764764145105,61,219423,0.30780830911151763,"
 You have 1844 out of 10000 Pokos and 61 out of 201 treasures.",2023-01-23 13:41:22.684110
+1881,875480,0.18818008611558196,61,219748,0.30826422166608686,"
+You have 1881 out of 10000 Pokos and 61 out of 201 treasures.",2023-01-24 12:48:59.877802