From 4b5a437b1d2dc4060fb70d1c8c1c83c93d22f46d Mon Sep 17 00:00:00 2001
From: kiwi515 <49212064+kiwi515@users.noreply.github.com>
Date: Sat, 29 Aug 2026 16:58:47 -0400
Subject: [PATCH 1/2] RPSysSceneMgr OK

---
 configure.py                        | 2 +-
 src/Pack/RPSystem/RPSysSceneMgr.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.py b/configure.py
index 40eda971..11afe8bc 100755
--- a/configure.py
+++ b/configure.py
@@ -1208,7 +1208,7 @@ def MatchingFor(*versions):
             Object(NonMatching, "Pack/RPSystem/RPSysSceneCreator.cpp"),
             Object(Matching, "Pack/RPSystem/RPSysScene.cpp"),
             Object(Matching, "Pack/RPSystem/RPSysRenderMode.cpp"),
-            Object(NonMatching, "Pack/RPSystem/RPSysSceneMgr.cpp"),
+            Object(Matching, "Pack/RPSystem/RPSysSceneMgr.cpp"),
             Object(Matching, "Pack/RPSystem/RPSysProjectLocal.cpp"),
             Object(Matching, "Pack/RPSystem/RPSysGameConfig.cpp"),
             Object(NonMatching, "Pack/RPSystem/RPSysTagParms.cpp"),
diff --git a/src/Pack/RPSystem/RPSysSceneMgr.cpp b/src/Pack/RPSystem/RPSysSceneMgr.cpp
index 13e9cb7d..b371d5b2 100644
--- a/src/Pack/RPSystem/RPSysSceneMgr.cpp
+++ b/src/Pack/RPSystem/RPSysSceneMgr.cpp
@@ -164,7 +164,7 @@ bool RPSysSceneMgr::changeNextSceneAfterFade(s32 id, bool reconfigure) {
     EMethod method = Default;
 
     if (getCurrentSceneRP() != NULL) {
-        s32 current = getCurrentSceneRP()->getSceneID();
+        int current = getCurrentSceneRP()->getSceneID();
 
         // Parent scene's exit type takes priority over the new create type
         RPSysSceneCreator::EExitType exitType =
@@ -486,7 +486,7 @@ void RPSysSceneMgr::updateState() {
             } else if (mState == EState_ReturnToMenu ||
                        mState == EState_Shutdown) {
 
-                setSceneFadeColor(DEFAULT_FADE_COLOR);
+                setFadeColor(DEFAULT_FADE_COLOR);
 
                 RP_GET_INSTANCE(RPSndAudioMgr)
                     ->shutdownSystem(DEFAULT_FADE_FRAME);

From 5d9ae7daa6aa39ed9be8015e817090a5c394b012 Mon Sep 17 00:00:00 2001
From: kiwi515 <49212064+kiwi515@users.noreply.github.com>
Date: Sat, 29 Aug 2026 16:58:53 -0400
Subject: [PATCH 2/2] Match `changeSceneAfterFade`

---
 src/Pack/RPSystem/RPSysSceneCreator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Pack/RPSystem/RPSysSceneCreator.cpp b/src/Pack/RPSystem/RPSysSceneCreator.cpp
index 8cf5a67d..0822b13d 100644
--- a/src/Pack/RPSystem/RPSysSceneCreator.cpp
+++ b/src/Pack/RPSystem/RPSysSceneCreator.cpp
@@ -106,7 +106,7 @@ bool RPSysSceneCreator::changeSceneAfterFade(s32 id, bool reconfigure) {
     bool success = false;
 
     if (RP_GET_INSTANCE(RPSysSceneMgr)->isTaskFinished()) {
-        s32 current = RP_GET_INSTANCE(RPSysSceneMgr)->getCurrentSceneID();
+        int current = RP_GET_INSTANCE(RPSysSceneMgr)->getCurrentSceneID();
 
         if (reconfigure) {
             id = current;