RPSysPauseMenu and RPSysPauseMgr headers, RPSysAppMiiManager hotfix

config/RSPE01_01/symbols.txt

@@ -7194,7 +7194,7 @@ __ct__13RPSysSaveDataFv = .text:0x8018CB90; // type:function size:0xDC
 fn_8018CC6C = .text:0x8018CC6C; // type:function size:0x68
 fn_8018CCD4 = .text:0x8018CCD4; // type:function size:0x254
 fn_8018CF28 = .text:0x8018CF28; // type:function size:0xF4
-fn_8018D01C = .text:0x8018D01C; // type:function size:0x18
+draw__13RPSysPauseMgrFv = .text:0x8018D01C; // type:function size:0x18
 fn_8018D034 = .text:0x8018D034; // type:function size:0x1EC
 fn_8018D220 = .text:0x8018D220; // type:function size:0x1F8
 fn_8018D418 = .text:0x8018D418; // type:function size:0x8
@@ -7635,7 +7635,7 @@ fn_801A0C20 = .text:0x801A0C20; // type:function size:0xC0
 fn_801A0CE0 = .text:0x801A0CE0; // type:function size:0x150
 fn_801A0E30 = .text:0x801A0E30; // type:function size:0x300
 fn_801A1130 = .text:0x801A1130; // type:function size:0x53C
-fn_801A166C = .text:0x801A166C; // type:function size:0x50
+draw__14RPSysPauseMenuFv = .text:0x801A166C; // type:function size:0x50
 fn_801A16BC = .text:0x801A16BC; // type:function size:0x3A0
 fn_801A1A5C = .text:0x801A1A5C; // type:function size:0x350
 fn_801A1DAC = .text:0x801A1DAC; // type:function size:0x234

configure.py

@@ -1205,7 +1205,7 @@ def MatchingFor(*versions):
             Object(Matching, "Pack/RPKernel/RPSysLytWindow.cpp"),
             Object(Matching, "Pack/RPKernel/RPSysKokeshiCtrlDataMgr.cpp"),
             Object(Matching, "Pack/RPKernel/RPSysKokeshiCtrlMgr.cpp"),
-            Object(NonMatching, "Pack/RPKernel/RPSysAppMiiManager.cpp"),
+            Object(Matching, "Pack/RPKernel/RPSysAppMiiManager.cpp"),
             Object(Matching, "Pack/RPKernel/RPSysPairingMgr.cpp"),
             Object(NonMatching, "Pack/RPKernel/RPSysControllerMgr.cpp"),
             Object(NonMatching, "Pack/RPKernel/RPSysNWC24Manager.cpp"),

include/Pack/RPKernel.h

@@ -42,6 +42,7 @@
 #include <Pack/RPKernel/RPSysNWC24Manager.h>
 #include <Pack/RPKernel/RPSysOfficialDB.h>
 #include <Pack/RPKernel/RPSysPairingMgr.h>
+#include <Pack/RPKernel/RPSysPauseMenu.h>
 #include <Pack/RPKernel/RPSysParticleManager.h>
 #include <Pack/RPKernel/RPSysStringUtility.h>
 #include <Pack/RPKernel/RPSysSystem.h>

include/Pack/RPKernel/RPSysAppMiiManager.h

@@ -31,7 +31,7 @@ class RPSysAppMiiManager {
     /**
      * @brief Destructor
      */
-    virtual ~RPSysAppMiiManager() {} // at 0x8
+    virtual ~RPSysAppMiiManager(); // at 0x8
 
     /**
      * @brief Loads the Mii data resources

include/Pack/RPKernel/RPSysPauseMenu.h

@@ -0,0 +1,60 @@
+#ifndef RP_KERNEL_PAUSE_MENU_H
+#define RP_KERNEL_PAUSE_MENU_H
+
+#include <nw4r/lyt.h>
+#include <Pack/types_pack.h>
+
+//! @addtogroup rp_kernel
+//! @{
+
+// Forward declarations
+class RPSysLayout;
+class RPSysLytBounding;
+class RPSysLytAnmObj;
+class RPSysLytTextBox;
+
+/**
+ * @brief Library that handles pause menu layout.
+ */
+
+class RPSysPauseMenu {
+    virtual ~RPSysPauseMenu();
+
+public:
+    void draw();
+
+private:
+    RPSysLayout* mLayout; // at 0x4
+    RPSysLytAnmObj* mAnmObj_0x04;
+    RPSysLytAnmObj* mAnmObj_0x08;
+    void* mUNK_0x10;
+    nw4r::lyt::Pane* mPane_0x14;
+    nw4r::lyt::Pane* mPane_0x18;
+    bool mUNK_0x1C;
+    bool mUNK_0x1D;
+    u8 mPAD_0x1E[2];
+    nw4r::lyt::Pane* mPane_0x20;
+    RPSysLytBounding* mBounding; // at 0x24
+    RPSysLytTextBox* mTextBox; // at 0x28
+    bool mUNK_0x2C;
+    bool mUNK_0x2D;
+    u8 mPAD_0x2E[10];
+    bool mUNK_0x38;
+    bool mUNK_0x39;
+    u8 mPAD_0x3A[26];
+    bool mUNK_0x54;
+    bool mUNK_0x55;
+    u8 mPAD_0x56[26];
+    void* mUtlCursor; //! At 0x70. RPUtlLytFrameCursor is not defined yet.
+    u8 mPAD_0x74[4];
+    bool mUNK_0x78;
+    u8 mPAD_0x79[4];
+    bool mUNK_0x7D;
+    bool mUNK_0x7E;
+    bool mUNK_0x7F;
+    u8 mPAD_0x80[8];
+};
+
+//! @}
+
+#endif

include/Pack/RPSystem/RPSysPauseMgr.h

@@ -2,6 +2,7 @@
 #define RP_SYSTEM_PAUSE_MGR_H
 #include <Pack/types_pack.h>
 
+#include <Pack/RPKernel.h>
 #include <Pack/RPSingleton.h>
 
 //! @addtogroup rp_system
@@ -14,15 +15,17 @@ class RPSysPauseMgr {
     RP_SINGLETON_DECL_EX(RPSysPauseMgr);
 
 public:
+    void init();
+    void draw();
     bool isPause() const {
-        return unk8 & 1;
+        return mPause & 1;
     }
 
 private:
-    u32 unk8;
-    u32 unkC;
+    BOOL mPause;
+    u32 mUNK_0x0C;
     f32 mFloats_0x10[120];
-    void *mLytPause;
+    RPSysPauseMenu *mPauseMenu;
 };
 
 //! @}

src/Pack/RPKernel/RPSysAppMiiManager.cpp

@@ -11,15 +11,25 @@
  * @param num Mii buffer capacity
  * @param pHeap Heap to use for allocations
  */
-RPSysAppMiiManager::RPSysAppMiiManager(u16 num, EGG::Heap* pHeap)
-    : mNumData(num), mppStoreData(NULL), mppCharData(NULL) {
+RPSysAppMiiManager::RPSysAppMiiManager(u16 num, EGG::Heap* pHeap) : mNumData(num) {
+    //! Private variables require out-of-declaration setting
+    //! because ProjectLocal is accessed here as well.
+    RPSysProjectLocal *local = RP_GET_INSTANCE(RPSysProjectLocal);
+    mppStoreData = NULL;
+    mppCharData = NULL;
 
     // Only Wii Sports uses character data (no checksum)
-    if (RP_GET_INSTANCE(RPSysProjectLocal)->getPack() ==
+    if (local->getPack() ==
         RPSysSceneCreator::EPackID_SportsPack) {
 
         mppCharData = new (pHeap) RFLCharData*[num];
     } else {
         mppStoreData = new (pHeap) RFLStoreData*[num];
     }
 }
+
+/**
+ * @brief Destructor
+ */
+ //! Should be defined here: wrong order otherwise
+RPSysAppMiiManager::~RPSysAppMiiManager() {}

src/Pack/RPKernel/RPSysPauseMenu.cpp

@@ -0,0 +1,11 @@
+#include <Pack/RPKernel.h>
+
+void RPSysPauseMenu::draw() {
+    if (!mUNK_0x78) {
+        mLayout->draw();
+        //! todo(texline): define RPUtlLytFrameCursor
+        // mUtlCursor->draw();
+    }
+}
+
+RPSysPauseMenu::~RPSysPauseMenu() {}

src/Pack/RPSystem/RPSysPauseMgr.cpp

@@ -0,0 +1,18 @@
+#include <Pack/RPKernel.h>
+#include <Pack/RPSingleton.h>
+#include <Pack/RPSystem.h>
+
+RP_SINGLETON_IMPL_EX(RPSysPauseMgr);
+
+void RPSysPauseMgr::draw() {
+    if (isPause()) {
+        mPauseMenu->draw();
+    }
+}
+
+/**
+ * @brief Destructor
+ */
+RPSysPauseMgr::~RPSysPauseMgr() {
+    //TODO(texline): delete mPauseMenu (it does not have a singleton)
+}

src/revolution/VI/vi.c

@@ -0,0 +1,16 @@
+#include <revolution/VI.h>
+
+static VIRetraceCallback PreCB;
+static void* CurrBufAddr;
+
+VIRetraceCallback VISetPreRetraceCallback(VIRetraceCallback callback) {
+    VIRetraceCallback currCB = PreCB;
+    BOOL enabled = OSDisableInterrupts();
+    PreCB = callback;
+    OSRestoreInterrupts(enabled);
+    return currCB;
+}
+
+void* VIGetCurrentFrameBuffer(void) {
+    return CurrBufAddr;
+}