Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions config/RSPE01_01/splits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2911,14 +2911,11 @@ Pack/RPSystem/RPSysTagParms.cpp:
.data start:0x803B9828 end:0x803B9850

Pack/RPSystem/RPSysLoadScene.cpp:
.text start:0x80186878 end:0x80186E40
.rodata start:0x80382568 end:0x803825C0
.sdata2 start:0x804C1538 end:0x804C1548

Pack/RPSystem/RP_80186E40.cpp:
.text start:0x80186E40 end:0x80186EB4
.text start:0x80186878 end:0x80186EB4
.ctors start:0x80355114 end:0x80355118
.rodata start:0x80382568 end:0x803825C0
.bss start:0x804A3DA0 end:0x804A3DE0
.sdata2 start:0x804C1538 end:0x804C1548

Pack/RPSystem/RPSysResourceManager.cpp:
.text start:0x80186EB4 end:0x80187B54
Expand Down
16 changes: 8 additions & 8 deletions config/RSPE01_01/symbols.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7001,8 +7001,8 @@ isTaskAsyncFinish__10RPSysSceneCFv = .text:0x80186CFC; // type:function size:0x2
setTaskAsync__10RPSysSceneFv = .text:0x80186D1C; // type:function size:0x10
loadUpdate__10RPSysSceneFv = .text:0x80186D2C; // type:function size:0x4
drawTimeStamp__10RPSysSceneFQ34nw4r2ut5Color = .text:0x80186D30; // type:function size:0x110
fn_80186E40 = .text:0x80186E40; // type:function size:0x58
fn_80186E98 = .text:0x80186E98; // type:function size:0x1C
__sinit_\RPSysLoadScene_cpp = .text:0x80186E40; // type:function size:0x58 scope:local
__arraydtor$25785 = .text:0x80186E98; // type:function size:0x1C scope:local
LoadFromDVD__20RPSysResourceManagerFPCcPQ23EGG4HeapQ33EGG9DvdRipper15EAllocDirectionPl = .text:0x80186EB4; // type:function size:0xEC
LoadCompressed__20RPSysResourceManagerFPCcPQ23EGG4Heap = .text:0x80186FA0; // type:function size:0x254
LoadStaticLocalArchive__20RPSysResourceManagerFPCc = .text:0x801871F4; // type:function size:0x9C
Expand All @@ -7022,9 +7022,9 @@ LoadGameLocalArchive__20RPSysResourceManagerFlPQ23EGG4Heap = .text:0x80187964; /
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
__dt__16RPSysQueuedSceneFv = .text:0x80187B54; // type:function size:0x40
reset__16RPSysQueuedSceneFv = .text:0x80187B94; // type:function size:0xC
CreateInstance__16RPSysQueuedSceneFPQ23EGG4Heap = .text:0x80187BA0; // type:function size:0x70
fn_80187C10 = .text:0x80187C10; // type:function size:0x7C
postUpdate__17RPSysCommonObjectFv = .text:0x80187C8C; // type:function size:0x88
preUpdate__17RPSysCommonObjectFv = .text:0x80187D14; // type:function size:0x64
Expand Down Expand Up @@ -18570,7 +18570,7 @@ __vt__18RPSysStringTagParm = .data:0x803B9828; // type:object size:0x14 scope:gl
__vt__12RPSysTagParm = .data:0x803B983C; // type:object size:0x14 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__16RPSysQueuedScene = .data:0x803B9870; // type:object size:0xC scope:global
__vt__17RPSysCommonObject = .data:0x803B9880; // type:object size:0x14 scope:global
__vt__11RPGrpScreen = .data:0x803B9894; // type:object size:0x14 scope:global
LANGUAGE_ENG__14RPSysDvdStatus = .data:0x803B98A8; // type:object size:0x10
Expand Down Expand Up @@ -19860,7 +19860,7 @@ sAlarmSoundOff__Q210homebutton10Controller = .bss:0x804A3C78; // type:object siz
sThis__Q210homebutton10Controller = .bss:0x804A3D38; // type:object size:0x10
spInstance__Q210homebutton9RemoteSpk = .bss:0x804A3D48; // type:object size:0x4 data:4byte
lbl_804A3D50 = .bss:0x804A3D50; // type:object size:0x50 data:4byte
lbl_804A3DA0 = .bss:0x804A3DA0; // type:object size:0x10
@25786 = .bss:0x804A3DA0; // type:object size:0xC scope:local
lbl_804A3DB0 = .bss:0x804A3DB0; // type:object size:0x30
sTextBuffer__15RPSysLytTextBox = .bss:0x804A3DE0; // type:object size:0x400
lbl_804A41E0 = .bss:0x804A41E0; // type:object size:0x30
Expand Down Expand Up @@ -21865,7 +21865,7 @@ spInstance__13RPSysSceneMgr = .sbss:0x804BF4D8; // type:object size:0x8 data:4by
spInstance__17RPSysProjectLocal = .sbss:0x804BF4E0; // type:object size:0x4 data:4byte
spInstance__15RPSysGameConfig = .sbss:0x804BF4E8; // type:object size:0x4 data:4byte
spInstance__20RPSysResourceManager = .sbss:0x804BF4F0; // type:object size:0x8 data:4byte
lbl_804BF4F8 = .sbss:0x804BF4F8; // type:object size:0x8 data:4byte
spInstance__16RPSysQueuedScene = .sbss:0x804BF4F8; // type:object size:0x4 data:4byte
spInstance__14RPSysDvdStatus = .sbss:0x804BF500; // type:object size:0x4 data:4byte
spInstance__16RPSysSaveDataMgr = .sbss:0x804BF508; // type:object size:0x8 data:4byte
spInstance__16RPSysFontManager = .sbss:0x804BF510; // type:object size:0x8 data:4byte
Expand Down
3 changes: 1 addition & 2 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -1213,9 +1213,8 @@ def MatchingFor(*versions):
Object(Matching, "Pack/RPSystem/RPSysGameConfig.cpp"),
Object(NonMatching, "Pack/RPSystem/RPSysTagParms.cpp"),
Object(NonMatching, "Pack/RPSystem/RPSysLoadScene.cpp"),
Object(NonMatching, "Pack/RPSystem/RP_80186E40.cpp"),
Object(NonMatching, "Pack/RPSystem/RPSysResourceManager.cpp"),
Object(NonMatching, "Pack/RPSystem/RPSysQueuedScene.cpp"),
Object(Matching, "Pack/RPSystem/RPSysQueuedScene.cpp"),
Object(NonMatching, "Pack/RPSystem/RPSysCommonObject.cpp"),
Object(Matching, "Pack/RPSystem/RPSysDvdStatus.cpp"),
Object(NonMatching, "Pack/RPSystem/RPSysSaveDataMgr.cpp"),
Expand Down
1 change: 1 addition & 0 deletions include/Pack/RPSystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include <Pack/RPSystem/RPSysPlayerMgr.h>
#include <Pack/RPSystem/RPSysPlayerSelectScene.h>
#include <Pack/RPSystem/RPSysProjectLocal.h>
#include <Pack/RPSystem/RPSysQueuedScene.h>
#include <Pack/RPSystem/RPSysRenderMode.h>
#include <Pack/RPSystem/RPSysResourceManager.h>
#include <Pack/RPSystem/RPSysSaveData.h>
Expand Down
31 changes: 31 additions & 0 deletions include/Pack/RPSystem/RPSysQueuedScene.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#ifndef RP_SYSTEM_QUEUED_SCENE_H
#define RP_SYSTEM_QUEUED_SCENE_H
#include <Pack/types_pack.h>

#include <Pack/RPKernel.h>

//! @addtogroup rp_system
//! @{

/**
* @brief Pack Project Queued Scene
*/
class RPSysQueuedScene {
RP_SINGLETON_DECL_EX(RPSysQueuedScene);

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these functions will be private by default without public:

/**
* @brief Resets the queued scene's ID
*/
void reset();

inline s32 getSceneID() {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
inline s32 getSceneID() {
s32 getSceneID() const {

return mSceneID;
}
private:
//! Queued Scene ID
s32 mSceneID; // at 0x8
};

//! @}

#endif
4 changes: 4 additions & 0 deletions src/Pack/RPSystem/RPSysLoadScene.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
#define RP_COMMON_SOUND_PATH "Sound/RPPartyCommon/rp_Common_Party.brsar"
#endif

// TODO(ThePlayerRolo) Check if this is used in other Revolution Pack Games since Wii Sports doesn't use it.
// Note this needs to be here since if inside of a seperate tu its gets optimized out
EGG::Vector3f lbl_804A3DB0[4];

/**
* @brief Displays the game's build date timestamp
*
Expand Down
21 changes: 21 additions & 0 deletions src/Pack/RPSystem/RPSysQueuedScene.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#include <RPSystem.h>

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#include <RPSystem.h>
#include <Pack/RPSystem.h>


RP_SINGLETON_IMPL_EX(RPSysQueuedScene)

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
RP_SINGLETON_IMPL_EX(RPSysQueuedScene)
RP_SINGLETON_IMPL_EX(RPSysQueuedScene);


/**
* @brief Constructor
*
* @param pHeap Parent heap
*/
RPSysQueuedScene::RPSysQueuedScene(EGG::Heap* pHeap) : mpParentHeap(pHeap) {
reset();
}

void RPSysQueuedScene::reset() {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could u copy paste the doc-comment from above the declaration pls

mSceneID = -1;
}

/**
* @brief Destructor
*/
RPSysQueuedScene::~RPSysQueuedScene() { }
Loading