Merge branch 'main' of https://github.com/PackProject/APClient

Author: cyndifusic

base/symbols_resort.txt

@@ -3588,6 +3588,7 @@ __dt__Q23EGG5SceneFv=0x801c8318
 sCurrentHeap__Q23EGG4Heap=0x806f49b0
 sTVMode__Q23EGG6Screen=0x806f4938
 sTVInfo__Q23EGG6Screen=0x806b4ad8
+__ct__Q23EGG6ScreenFv=0x801b83d0
 
 spInstance__11RPSysSystem=0x806f4c68
 spInstance__13RPSysSceneMgr=0x806f4c98
@@ -3630,8 +3631,16 @@ sDrawPass__13RPGrpRenderer=0x806f0bf8
 spInstance__15RPSysTextWriter=0x806f4d08
 Begin__15RPSysTextWriterFv=0x8023bdfc
 mainLoop__11RPSysSystemFv=0x80237b2c
+spCurrent__13RPGrpRenderer=0x806f4e04
+AppendDrawObject__13RPGrpRendererFP16IRPGrpDrawObject=0x80253d44
+CreateView2D__13RPGrpRendererFUcP11RPGrpScreen=0x80253e1c
+CorrectView__13RPGrpRendererFv=0x80253d68
+__vt__11RPGrpScreen=0x806b5358
+
+startSeWithRemote__Q23Sp23SndFUlUl=0x802b735c
+startSe__Q23Sp23SndFUl=0x802b73bc
+startBgm__Q23Sp23SndFUl=0x802b7228
 
-playSound__Q23Sp27SndUtilFUlUl=0x802b735c
 sInstance__Q33Sp23Swf5Scene=0x806f5ff0
 spInstance__Q33Sp23Cmn9StaticMem=0x806f4e98
 spInstance__17RPSysSystemWinMgr=0x806f4cd0
@@ -3641,4 +3650,4 @@ sActiveScreen__13RPGrpRenderer=0x807cef2c
 setStaticVar__Q33Sp23Cmn9StaticMemFiib=0x80269f08
 
 setTimer__Q43Sp23Bsk3Lyt4MainFUlUl=0x80533a78
-setType__Q33Sp23Bsk4BallFQ43Sp23Bsk4Ball5EType=0x804ffa44
+setType__Q33Sp23Bsk4BallFQ43Sp23Bsk4Ball5EType=0x804ffa44

include/Sports2/Snd/Sp2SndUtil.h

@@ -3,13 +3,13 @@
 #include <Sports2/Sp2Types.h>
 
 namespace Sp2 {
+namespace Snd {
 
-class SndUtil {
-public:
-    static void playBgm(u32 id);
-    static void playSound(u32 id, u32 spkFlag);
-};
+void startBgm(u32 id);
+void startSe(u32 id);
+void startSeWithRemote(u32 id, u32 spkFlag);
 
+} // namespace Snd
 } // namespace Sp2
 
-#endif
+#endif

include/egg/core/eggController.h

@@ -142,7 +142,13 @@ class CoreController {
     u32 mButtonHold;    // at 0x8
     u32 mButtonTrigger; // at 0xC
     u32 mButtonRelease; // at 0x10
+#if defined(PACK_RESORT)
+    char _14[0x4];
+#endif
     CoreStatus mCoreStatus[16];
+#if defined(PACK_RESORT)
+    char _858[0xF18 - 0x858];
+#endif
     int mKPADReadLength; // at 0x854
     Vector3f VEC3_0x858;
     UNKWORD WORD_0x864;

include/nw4r/ut/ut_Font.h

@@ -72,7 +72,10 @@ class Font {
     virtual int GetCharWidth(u16 ch) const = 0;             // at 0x48
     virtual CharWidths GetCharWidths(u16 ch) const = 0;     // at 0x4C
     virtual void GetGlyph(Glyph* pGlyph, u16 ch) const = 0; // at 0x50
-    virtual FontEncoding GetEncoding() const = 0;           // at 0x54
+#if defined(PACK_RESORT)
+    virtual bool HasGlyph(u16 ch) const = 0; // at 0x54
+#endif
+    virtual FontEncoding GetEncoding() const = 0; // at 0x54
 
     void InitReaderFunc(FontEncoding encode);
 

include/nw4r/ut/ut_ResFontBase.h

@@ -97,7 +97,10 @@ class ResFontBase : public Font {
     virtual int GetCharWidth(u16 ch) const;             // at 0x48
     virtual CharWidths GetCharWidths(u16 ch) const;     // at 0x4C
     virtual void GetGlyph(Glyph* pGlyph, u16 ch) const; // at 0x50
-    virtual FontEncoding GetEncoding() const;           // at 0x54
+#if defined(PACK_RESORT)
+    virtual bool HasGlyph(u16 ch) const = 0; // at 0x54
+#endif
+    virtual FontEncoding GetEncoding() const; // at 0x54
 
 protected:
     bool IsManaging(const void* pBuffer) const {

lib/libkiwi/core/kiwiIScene.cpp

@@ -14,6 +14,7 @@ void IScene::Configure() {
     RP_GET_INSTANCE(RPGrpModelResManager)->CreateResourceList(0x400);
     RP_GET_INSTANCE(RPGrpModelManager)
         ->CreateModelScene(0, 0, 1, nullptr, nullptr);
+#endif
 
     // Setup renderer view
     RPGrpScreen* pScreen = new RPGrpScreen();
@@ -22,7 +23,6 @@ void IScene::Configure() {
 
     RPGrpRenderer::GetCurrent()->CreateView2D(1, pScreen);
     RPGrpRenderer::GetCurrent()->CorrectView();
-#endif
 
     // User state function
     OnConfigure();

lib/libkiwi/core/kiwiIScene.h

@@ -87,6 +87,20 @@ class IScene : public RPSysScene {
     }
 
 #if defined(PACK_RESORT)
+    /**
+     * @brief Gets the scene's group ID
+     */
+    virtual EGroupID GetGroup() const {
+        return EGroupID_Cmn;
+    }
+
+    /**
+     * @brief Tests whether to show the warning screen while loading
+     */
+    virtual bool GetWarnAsLoading() const {
+        return false;
+    }
+
     /**
      * @brief Gets the scene's type
      */
@@ -244,6 +258,10 @@ template <typename T> class SceneDecl {
             static_cast<T*>(nullptr)->T::GetName(),
             static_cast<T*>(nullptr)->T::GetDirectory(),
             static_cast<T*>(nullptr)->T::GetID(),
+#if defined(PACK_RESORT)
+            static_cast<T*>(nullptr)->T::GetWarnAsLoading(),
+            static_cast<T*>(nullptr)->T::GetGroup(),
+#endif
             static_cast<T*>(nullptr)->T::GetPack(),
             static_cast<T*>(nullptr)->T::GetCreateType(),
             static_cast<T*>(nullptr)->T::GetExitType(),

lib/libkiwi/core/kiwiSceneCreator.cpp

@@ -79,6 +79,8 @@ TMap<s32, SceneCreator::Info> SceneCreator::sUserScenes;
 
 //! Root debug menu scene ID
 s32 SceneCreator::sDebugRootID = -1;
+//! Whether to boot into the root debug menu
+bool SceneCreator::sDebugRootBootUp = false;
 //! Root debug menu button combination (held)
 u16 SceneCreator::sDebugRootButtons = 0xFFFF;
 
@@ -132,16 +134,19 @@ void SceneCreator::RegistScene(const Info& rInfo) {
 /**
  * @brief Registers root debug menu information
  * @details The debug root scene is entered when transitioning to the main
- * menu while the specified button mask is held.
+ * menu while the specified button mask is held, or always on first boot
+ * if the bootUp flag is set.
  *
  * @param id Debug root scene ID (-1 to disable)
- * @param buttons Buttons that must be held to visit the debug menu
- * (defaults to B+Minus+1+2)
+ * @param bootUp Whether to boot into the debug root scene
+ * @param buttons Buttons that must be held to visit the debug root scene
+ * (defaults to B+MINUS)
  */
-void SceneCreator::RegistDebugRoot(s32 id, u16 buttons) {
+void SceneCreator::RegistDebugRoot(s32 id, bool bootUp, u16 buttons) {
     K_ASSERT_EX(id >= 0 || id == -1, "Invalid scene ID");
 
     sDebugRootID = id;
+    sDebugRootBootUp = bootUp;
     sDebugRootButtons = buttons;
 }
 
@@ -194,12 +199,18 @@ bool SceneCreator::ChangeSceneAfterFade(s32 id, bool reload) {
     }
 
     // Visit debug root instead of menu if buttons are held
-    if (id == GetMenuScene()) {
+    if (id == GetMenuScene() && current != sDebugRootID) {
         for (int i = 0; i < EPlayer_Max; i++) {
             const WiiCtrl& rCtrl =
                 CtrlMgr::GetInstance().GetWiiCtrl(static_cast<EPlayer>(i));
 
-            if (rCtrl.IsConnected() && rCtrl.IsHold(sDebugRootButtons)) {
+            bool visit = sDebugRootBootUp;   // Visit on boot
+            visit |= sDebugRootButtons == 0; // Always visit
+            visit |= rCtrl.IsConnected() &&
+                     rCtrl.IsHold(sDebugRootButtons); // Button combo held
+
+            if (visit) {
+                sDebugRootBootUp = false;
                 id = sDebugRootID;
                 break;
             }
@@ -243,13 +254,19 @@ bool SceneCreator::ChangeSceneAfterFade(s32 id, const nw4r::ut::Color* pColor) {
         id = current;
     }
 
-    // Visit debug root instead of menu if buttons are held
-    if (id == GetMenuScene()) {
+    // Visit debug root instead of menu if on boot, or if buttons are held
+    if (id == GetMenuScene() && current != sDebugRootID) {
         for (int i = 0; i < EPlayer_Max; i++) {
             const WiiCtrl& rCtrl =
                 CtrlMgr::GetInstance().GetWiiCtrl(static_cast<EPlayer>(i));
 
-            if (rCtrl.IsConnected() && rCtrl.IsHold(sDebugRootButtons)) {
+            bool visit = sDebugRootBootUp;   // Visit on boot
+            visit |= sDebugRootButtons == 0; // Always visit
+            visit |= rCtrl.IsConnected() &&
+                     rCtrl.IsHold(sDebugRootButtons); // Button combo held
+
+            if (visit) {
+                sDebugRootBootUp = false;
                 id = sDebugRootID;
                 break;
             }

lib/libkiwi/core/kiwiSceneCreator.h

@@ -192,15 +192,16 @@ class SceneCreator : public ExtSingletonPtr<RPSysSceneCreator, SceneCreator> {
     /**
      * @brief Registers root debug menu information
      * @details The debug root scene is entered when transitioning to the main
-     * menu while the specified button mask is held.
+     * menu while the specified button mask is held, or always on first boot
+     * if the bootUp flag is set.
      *
      * @param id Debug root scene ID (-1 to disable)
-     * @param buttons Buttons that must be held to visit the debug menu
-     * (defaults to B+MINUS+2)
+     * @param bootUp Whether to boot into the debug root scene
+     * @param buttons Buttons that must be held to visit the debug root scene
+     * (defaults to B+MINUS)
      */
-    static void RegistDebugRoot(s32 id,
-                                u16 buttons = (EButton_B | EButton_Minus |
-                                               EButton_2));
+    static void RegistDebugRoot(s32 id, bool bootUp = true,
+                                u16 buttons = EButton_B | EButton_Minus);
 
     /**
      * @brief Gets the scene ID of the main menu scene
@@ -347,6 +348,8 @@ class SceneCreator : public ExtSingletonPtr<RPSysSceneCreator, SceneCreator> {
 
     //! Root debug menu scene ID
     static s32 sDebugRootID;
+    //! Whether to boot into the root debug menu
+    static bool sDebugRootBootUp;
     //! Root debug menu button combination (held)
     static u16 sDebugRootButtons;
 };

lib/libkiwi/core/kiwiSceneHookMgr.cpp

@@ -71,13 +71,13 @@ void SceneHookMgr::DoEnter() {
     GetCurrentScene()->Configure();
 
     // Global hooks
-    K_FOREACH (GetInstance().mGlobalHooks) {
+    K_FOREACH (it, GetInstance().mGlobalHooks) {
         it->Configure(GetCurrentScene());
     }
 
     // Hooks for game scene
     if (IsPackScene()) {
-        K_FOREACH (GetInstance().GetActiveHooks()) {
+        K_FOREACH (it, GetInstance().GetActiveHooks()) {
             it->Configure(GetCurrentScene());
         }
     }
@@ -93,27 +93,27 @@ KOKESHI_BY_PACK(KM_CALL(0x8018532c, SceneHookMgr::DoEnter),  // Wii Sports
  */
 void SceneHookMgr::DoReset() {
     // Global hooks
-    K_FOREACH (GetInstance().mGlobalHooks) {
+    K_FOREACH (it, GetInstance().mGlobalHooks) {
         it->BeforeReset(GetCurrentScene());
     }
 
     // Hooks for game scene
     if (IsPackScene()) {
-        K_FOREACH (GetInstance().GetActiveHooks()) {
+        K_FOREACH (it, GetInstance().GetActiveHooks()) {
             it->BeforeReset(GetCurrentScene());
         }
     }
 
     GetCurrentScene()->Reset();
 
     // Global hooks
-    K_FOREACH (GetInstance().mGlobalHooks) {
+    K_FOREACH (it, GetInstance().mGlobalHooks) {
         it->AfterReset(GetCurrentScene());
     }
 
     // Hooks for game scene
     if (IsPackScene()) {
-        K_FOREACH (GetInstance().GetActiveHooks()) {
+        K_FOREACH (it, GetInstance().GetActiveHooks()) {
             it->AfterReset(GetCurrentScene());
         }
     }
@@ -132,13 +132,13 @@ KOKESHI_BY_PACK(KM_CALL(0x801853d4, SceneHookMgr::DoReset),  // Wii Sports
  */
 void SceneHookMgr::DoLoadResource() {
     // Global hooks
-    K_FOREACH (GetInstance().mGlobalHooks) {
+    K_FOREACH (it, GetInstance().mGlobalHooks) {
         it->LoadResource(GetCurrentScene());
     }
 
     // Hooks for game scene
     if (IsPackScene()) {
-        K_FOREACH (GetInstance().GetActiveHooks()) {
+        K_FOREACH (it, GetInstance().GetActiveHooks()) {
             it->LoadResource(GetCurrentScene());
         }
     }
@@ -154,13 +154,13 @@ KOKESHI_BY_PACK(KM_BRANCH(0x8018695c, SceneHookMgr::DoLoadResource),  // Wii Spo
  */
 void SceneHookMgr::DoCalculate() {
     // Global hooks
-    K_FOREACH (GetInstance().mGlobalHooks) {
+    K_FOREACH (it, GetInstance().mGlobalHooks) {
         it->BeforeCalculate(GetCurrentScene());
     }
 
     // Hooks for game scene
     if (IsPackScene()) {
-        K_FOREACH (GetInstance().GetActiveHooks()) {
+        K_FOREACH (it, GetInstance().GetActiveHooks()) {
             it->BeforeCalculate(GetCurrentScene());
         }
     }
@@ -170,13 +170,13 @@ void SceneHookMgr::DoCalculate() {
     RP_GET_INSTANCE(RPSysSceneMgr)->SceneManager::calcCurrentScene();
 
     // Global hooks
-    K_FOREACH (GetInstance().mGlobalHooks) {
+    K_FOREACH (it, GetInstance().mGlobalHooks) {
         it->AfterCalculate(GetCurrentScene());
     }
 
     // Hooks for game scene
     if (IsPackScene()) {
-        K_FOREACH (GetInstance().GetActiveHooks()) {
+        K_FOREACH (it, GetInstance().GetActiveHooks()) {
             it->AfterCalculate(GetCurrentScene());
         }
     }
@@ -192,13 +192,13 @@ KOKESHI_BY_PACK(KM_BRANCH(0x80185868, SceneHookMgr::DoCalculate),  // Wii Sports
  */
 void SceneHookMgr::DoExit() {
     // Global hooks
-    K_FOREACH (GetInstance().mGlobalHooks) {
+    K_FOREACH (it, GetInstance().mGlobalHooks) {
         it->Exit(GetCurrentScene());
     }
 
     // Hooks for game scene
     if (IsPackScene()) {
-        K_FOREACH (GetInstance().GetActiveHooks()) {
+        K_FOREACH (it, GetInstance().GetActiveHooks()) {
             it->Exit(GetCurrentScene());
         }
     }
@@ -214,13 +214,13 @@ KOKESHI_BY_PACK(KM_BRANCH(0x80185000, SceneHookMgr::DoExit),  // Wii Sports
  */
 void SceneHookMgr::DoPause() {
     // Global hooks
-    K_FOREACH (GetInstance().mGlobalHooks) {
+    K_FOREACH (it, GetInstance().mGlobalHooks) {
         it->Pause(GetCurrentScene(), true);
     }
 
     // Hooks for game scene
     if (IsPackScene()) {
-        K_FOREACH (GetInstance().GetActiveHooks()) {
+        K_FOREACH (it, GetInstance().GetActiveHooks()) {
             it->Pause(GetCurrentScene(), true);
         }
     }
@@ -236,13 +236,13 @@ KOKESHI_BY_PACK(KM_BRANCH(0x801b68ec, SceneHookMgr::DoPause), // Wii Sports
  */
 void SceneHookMgr::DoUnPause() {
     // Global hooks
-    K_FOREACH (GetInstance().mGlobalHooks) {
+    K_FOREACH (it, GetInstance().mGlobalHooks) {
         it->Pause(GetCurrentScene(), false);
     }
 
     // Hooks for game scene
     if (IsPackScene()) {
-        K_FOREACH (GetInstance().GetActiveHooks()) {
+        K_FOREACH (it, GetInstance().GetActiveHooks()) {
             it->Pause(GetCurrentScene(), false);
         }
     }