RPSysResourceManager WIP (#131)

Author: kiwi515

config/RSPE01_01/symbols.txt

@@ -7002,25 +7002,25 @@ fn_80186D2C = .text:0x80186D2C; // type:function size:0x4
 fn_80186D30 = .text:0x80186D30; // type:function size:0x110
 fn_80186E40 = .text:0x80186E40; // type:function size:0x58
 fn_80186E98 = .text:0x80186E98; // type:function size:0x1C
-fn_80186EB4 = .text:0x80186EB4; // type:function size:0xEC
-fn_80186FA0 = .text:0x80186FA0; // type:function size:0x254
-fn_801871F4 = .text:0x801871F4; // type:function size:0x9C
+LoadFromDVD__20RPSysResourceManagerFPCcPQ23EGG4HeapQ33EGG9DvdRipper15EAllocDirectionPl = .text:0x80186EB4; // type:function size:0xEC
+LoadCompressed__20RPSysResourceManagerFPCcPQ23EGG4Heap = .text:0x80186FA0; // type:function size:0x254
+LoadStaticLocalArchive__20RPSysResourceManagerFPCc = .text:0x801871F4; // type:function size:0x9C
 GetGameSoundLocalPath__20RPSysResourceManagerFPcUll = .text:0x80187290; // type:function size:0x70
 GetGameSoundCommonPath__20RPSysResourceManagerFPcUll = .text:0x80187300; // type:function size:0x6C
 GetStaticSoundLocalPath__20RPSysResourceManagerFPcUl = .text:0x8018736C; // type:function size:0x7C
 GetStaticSoundCommonPath__20RPSysResourceManagerFPcUl = .text:0x801873E8; // type:function size:0x64
-fn_8018744C = .text:0x8018744C; // type:function size:0x68
-fn_801874B4 = .text:0x801874B4; // type:function size:0x150
-fn_80187604 = .text:0x80187604; // type:function size:0x1D0
+LoadKokeshiArchive__20RPSysResourceManagerFv = .text:0x8018744C; // type:function size:0x68
+LoadCacheArchives__20RPSysResourceManagerFv = .text:0x801874B4; // type:function size:0x150
+LoadStaticArchives__20RPSysResourceManagerFv = .text:0x80187604; // type:function size:0x1D0
 RemoveFromFileList__20RPSysResourceManagerFP9RPSysFile = .text:0x801877D4; // type:function size:0x8
 IsExist__20RPSysResourceManagerFPCc = .text:0x801877DC; // type:function size:0x60
-fn_8018783C = .text:0x8018783C; // type:function size:0x3C
-fn_80187878 = .text:0x80187878; // type:function size:0x4C
-fn_801878C4 = .text:0x801878C4; // type:function size:0xA0
-fn_80187964 = .text:0x80187964; // type:function size:0xA8
-fn_80187A0C = .text:0x80187A0C; // type:function size:0x9C
-fn_80187AA8 = .text:0x80187AA8; // type:function size:0x40
-fn_80187AE8 = .text:0x80187AE8; // type:function size:0x6C
+GetMessageResource__20RPSysResourceManagerFPCc = .text:0x8018783C; // type:function size:0x3C
+GetFileFromArchive__20RPSysResourceManagerFPQ23EGG7ArchivePCcPUl = .text:0x80187878; // type:function size:0x4C
+LoadGameStageArchive__20RPSysResourceManagerFPCc = .text:0x801878C4; // type:function size:0xA0
+LoadGameLocalArchive__20RPSysResourceManagerFlPQ23EGG4Heap = .text:0x80187964; // type:function size:0xA8
+LoadGameCommonArchive__20RPSysResourceManagerFlPQ23EGG4Heap = .text:0x80187A0C; // type:function size:0x9C
+__dt__20RPSysResourceManagerFv = .text:0x80187AA8; // type:function size:0x40
+CreateInstance__20RPSysResourceManagerFv = .text:0x80187AE8; // type:function size:0x6C
 fn_80187B54 = .text:0x80187B54; // type:function size:0x40
 fn_80187B94 = .text:0x80187B94; // type:function size:0xC
 fn_80187BA0 = .text:0x80187BA0; // type:function size:0x70
@@ -15058,7 +15058,7 @@ lbl_80382438 = .rodata:0x80382438; // type:object size:0x18
 @stringBase0 = .rodata:0x80382470; // type:object size:0xF2 scope:local data:string_table
 lbl_80382568 = .rodata:0x80382568; // type:object size:0x48
 lbl_803825B0 = .rodata:0x803825B0; // type:object size:0xC data:string
-lbl_803825C0 = .rodata:0x803825C0; // type:object size:0x38 data:4byte
+CACHED_SCENES__20RPSysResourceManager = .rodata:0x803825C0; // type:object size:0x38 data:4byte
 lbl_803825F8 = .rodata:0x803825F8; // type:object size:0xE data:string
 lbl_80382606 = .rodata:0x80382606; // type:object size:0xD data:string
 lbl_80382613 = .rodata:0x80382613; // type:object size:0xE data:string
@@ -18566,7 +18566,7 @@ __vt__15RPSysGameConfig = .data:0x803B9808; // type:object size:0xC scope:global
 __vt__19RPSysPrimTagParm<i> = .data:0x803B9814; // type:object size:0x14 scope:weak
 __vt__18RPSysStringTagParm = .data:0x803B9828; // type:object size:0x14 scope:global
 __vt__12RPSysTagParm = .data:0x803B983C; // type:object size:0x14 scope:global
-scStaticPaths__20RPSysResourceManager = .data:0x803B9850; // type:object size:0x10 scope:global
+STATIC_DIR_NAMES__20RPSysResourceManager = .data:0x803B9850; // type:object size:0x10 scope:global
 __vt__20RPSysResourceManager = .data:0x803B9860; // type:object size:0x10 scope:global
 __vt__16RPSysQueuedScene = .data:0x803B9870; // type:object size:0x10 scope:global
 __vt__17RPSysCommonObject = .data:0x803B9880; // type:object size:0x14 scope:global
@@ -20439,7 +20439,7 @@ scResFileFullPathName = .sdata:0x804BDB60; // type:object size:0x4 scope:local d
 scFileNames = .sdata:0x804BDB68; // type:object size:0x8 scope:local
 scFirstDirectory = .sdata:0x804BDB70; // type:object size:0x4 scope:local data:4byte
 scSecondDirectory = .sdata:0x804BDB74; // type:object size:0x4 scope:local data:4byte
-lbl_804BDB78 = .sdata:0x804BDB78; // type:object size:0x8 data:4byte
+KOKESHI_ARCHIVE_PATH__20RPSysResourceManager = .sdata:0x804BDB78; // type:object size:0x4 data:4byte
 GAME_DISK_NAME__14RPSysDvdStatus = .sdata:0x804BDB80; // type:object size:0x4 data:4byte
 lbl_804BDB88 = .sdata:0x804BDB88; // type:object size:0x8 data:4byte
 lbl_804BDB90 = .sdata:0x804BDB90; // type:object size:0x8 data:4byte

docs/contributing.md

@@ -325,14 +325,14 @@ public:
 
 // 2. PROTECTED ACCESS
 protected:
-    // 7. Non-static functions
+    // 7. All other functions
     const Fruit& GetFruit(int i) const {
         return mFruits[i];
     }
 
 // 3. PRIVATE ACCESS
 private:
-    // 7. Non-static functions
+    // 7. All other functions
     void Clear();
 
     // 8. Constant, static members

include/Pack/RPKernel/IRPSysKokeshiBodyManager.h

@@ -6,7 +6,6 @@
 
 #include <egg/math.h>
 
-
 //! @addtogroup rp_kernel
 //! @{
 

include/Pack/RPKernel/RPSysAppMiiManager.h

@@ -2,10 +2,10 @@
 #define RP_KERNEL_APP_MII_MANAGER_H
 #include <Pack/types_pack.h>
 
-#include <egg/core.h>
-
 #include <RVLFaceLib.h>
 
+#include <egg/core.h>
+
 //! @addtogroup rp_kernel
 //! @{
 
@@ -33,6 +33,11 @@ class RPSysAppMiiManager {
      */
     virtual ~RPSysAppMiiManager() {} // at 0x8
 
+    /**
+     * @brief Loads the Mii data resources
+     */
+    virtual void LoadResource() = 0; // at 0xC
+
     /**
      * @brief Gets the capacity of the Mii buffer
      */

include/Pack/RPKernel/RPSysFile.h

@@ -13,6 +13,10 @@
  * @brief Cached resource file
  */
 class RPSysFile : public EGG::Disposer {
+public:
+    //! Maximum file path length
+    static const u32 PATH_MAX = 128;
+
 public:
     /**
      * @brief Constructor
@@ -46,18 +50,14 @@ class RPSysFile : public EGG::Disposer {
     /**
      * @brief Gets the data of this file
      */
-    const void* GetData() const {
+    const u8* GetData() const {
         return mpData;
     }
 
 public:
     //! Linked-list node used for cache lists
     NW4R_UT_LIST_LINK_DECL(); // at 0x10
 
-private:
-    //! Maximum file path length
-    static const u32 PATH_MAX = 128;
-
 private:
     //! File path
     char mPath[PATH_MAX]; // at 0x18

include/Pack/RPParty.h

@@ -0,0 +1,6 @@
+#ifndef RP_PUBLIC_PARTY_H
+#define RP_PUBLIC_PARTY_H
+
+#include <Pack/RPParty/RPPartyBodyManager.h>
+
+#endif

include/Pack/RPParty/RPPartyBodyManager.h

@@ -0,0 +1,54 @@
+#ifndef RP_PARTY_BODY_MANAGER_H
+#define RP_PARTY_BODY_MANAGER_H
+#include <Pack/types_pack.h>
+
+#include <Pack/RPKernel.h>
+
+//! @addtogroup rp_party
+//! @{
+
+/**
+ * @brief Party Pack Mii body manager
+ */
+class RPPartyBodyManager : public IRPSysKokeshiBodyManager {
+public:
+    /**
+     * @brief Constructor
+     */
+    RPPartyBodyManager();
+
+    /**
+     * @brief Destructor
+     */
+    virtual ~RPPartyBodyManager(); // at 0x2C
+
+    virtual u16 GetFriendClothesStartIndex(); // at 0x8
+    virtual u16 GetFriendClothesIndexRange(); // at 0xC
+
+    virtual const char* GetBodyFileName(u16 bodyType,
+                                        RFLSex sex); // at 0x10
+
+    virtual u16 GetBodyModelIndex(u16 bodyType, RFLSex sex, u32 height,
+                                  u32 build); // at 0x14
+
+    virtual const char* GetClothesFileName(); // at 0x18
+
+    virtual void GetClothesName(u16 clothesType, RFLSex sex,
+                                const char** ppNameA,
+                                const char** ppNameB); // at 0x1C
+
+    virtual void GetHeadJointMtx(u16 bodyType, RPGrpModel* pBodyModel,
+                                 EGG::Matrix34f* pMtx); // at 0x20
+
+    virtual void GetLeftHandJointMtx(u16 bodyType, RPGrpModel* pBodyModel,
+                                     EGG::Matrix34f* pMtx); // at 0x24
+    virtual void GetRightHandJointMtx(u16 bodyType, RPGrpModel* pBodyModel,
+                                      EGG::Matrix34f* pMtx); // at 0x28
+
+private:
+    // . . .
+};
+
+//! @}
+
+#endif

include/Pack/RPSports.h

@@ -0,0 +1,7 @@
+#ifndef RP_PUBLIC_SPORTS_H
+#define RP_PUBLIC_SPORTS_H
+
+#include <Pack/RPSports/RPSportsAppMiiManager.h>
+#include <Pack/RPSports/RPSportsBodyManager.h>
+
+#endif

include/Pack/RPSports/RPSportsAppMiiManager.h

@@ -0,0 +1,35 @@
+#ifndef RP_SPORTS_APP_MII_MANAGER_H
+#define RP_SPORTS_APP_MII_MANAGER_H
+#include <Pack/types_pack.h>
+
+#include <Pack/RPKernel.h>
+
+#include <egg/core.h>
+
+//! @addtogroup rp_sports
+//! @{
+
+/**
+ * @brief Sports Pack Mii data manager
+ */
+class RPSportsAppMiiManager : public RPSysAppMiiManager {
+public:
+    /**
+     * @brief Constructor
+     *
+     * @param pHeap Heap to use for allocations
+     */
+    RPSportsAppMiiManager(EGG::Heap* pHeap);
+
+    /**
+     * @brief Loads the Mii data resources
+     */
+    virtual void LoadResource(); // at 0xC
+
+private:
+    // . . .
+};
+
+//! @}
+
+#endif

include/Pack/RPSports/RPSportsBodyManager.h

@@ -0,0 +1,54 @@
+#ifndef RP_SPORTS_BODY_MANAGER_H
+#define RP_SPORTS_BODY_MANAGER_H
+#include <Pack/types_pack.h>
+
+#include <Pack/RPKernel.h>
+
+//! @addtogroup rp_sports
+//! @{
+
+/**
+ * @brief Sports Pack Mii body manager
+ */
+class RPSportsBodyManager : public IRPSysKokeshiBodyManager {
+public:
+    /**
+     * @brief Constructor
+     */
+    RPSportsBodyManager();
+
+    /**
+     * @brief Destructor
+     */
+    virtual ~RPSportsBodyManager(); // at 0x2C
+
+    virtual u16 GetFriendClothesStartIndex(); // at 0x8
+    virtual u16 GetFriendClothesIndexRange(); // at 0xC
+
+    virtual const char* GetBodyFileName(u16 bodyType,
+                                        RFLSex sex); // at 0x10
+
+    virtual u16 GetBodyModelIndex(u16 bodyType, RFLSex sex, u32 height,
+                                  u32 build); // at 0x14
+
+    virtual const char* GetClothesFileName(); // at 0x18
+
+    virtual void GetClothesName(u16 clothesType, RFLSex sex,
+                                const char** ppNameA,
+                                const char** ppNameB); // at 0x1C
+
+    virtual void GetHeadJointMtx(u16 bodyType, RPGrpModel* pBodyModel,
+                                 EGG::Matrix34f* pMtx); // at 0x20
+
+    virtual void GetLeftHandJointMtx(u16 bodyType, RPGrpModel* pBodyModel,
+                                     EGG::Matrix34f* pMtx); // at 0x24
+    virtual void GetRightHandJointMtx(u16 bodyType, RPGrpModel* pBodyModel,
+                                      EGG::Matrix34f* pMtx); // at 0x28
+
+private:
+    // . . .
+};
+
+//! @}
+
+#endif