Skip to content

RPSysHomeMenuMgr WIP for real #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kiwi515 merged 17 commits into from
Sep 4, 2026
Merged

RPSysHomeMenuMgr WIP for real #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e12f42b
RPSysSystem::softResetCallback 100%, beginning RPSysHomeMenuMgr and R…
Aug 27, 2026
82f311d
Fixed build.yml
Aug 27, 2026
30cbf73
fixed for real
Aug 27, 2026
2cfc671
softResetCallBack 100%, HomeMenuMgr WIP
Aug 27, 2026
0dfecfd
More work on RPSysSystem, reverting build.yml
Aug 28, 2026
f94f347
Implementing requested changes
Aug 28, 2026
57290a6
updating
Aug 29, 2026
248352d
updating again
Aug 29, 2026
8aeeff4
Merge branch 'master' of https://github.com/doldecomp/ogws
Aug 29, 2026
6a892f8
fix symbols
Aug 29, 2026
733d2fc
Merge branch 'master' of https://github.com/doldecomp/ogws
Aug 29, 2026
5ff9ac8
Merge branch 'master' of https://github.com/doldecomp/ogws
Aug 30, 2026
44d2c43
Creating separate branch for pull rq
Sep 3, 2026
aa29a64
Hot fix (isOpen was deleted)
Sep 3, 2026
14f0f37
Fixed bug that was introduced like a week ago that was causing checks…
Sep 3, 2026
775d8e8
Hotfix: LoadResource() and beginDrawScreen() are 100% matched
Sep 3, 2026
0d67c24
implementing feedback
Sep 4, 2026
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
56 changes: 28 additions & 28 deletions config/RSPE01_01/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6853,7 +6853,7 @@ setDimming__11RPSysSystemFi = .text:0x801831E8; // type:function size:0x8
systemShutDown__11RPSysSystemFv = .text:0x801831F0; // type:function size:0xD8
fn_801832C8 = .text:0x801832C8; // type:function size:0x28
fn_801832F0 = .text:0x801832F0; // type:function size:0x18
startLoadCount__11RPSysSystemFP11RPSysSystem = .text:0x80183308; // type:function size:0xC
startLoadCount__11RPSysSystemFv = .text:0x80183308; // type:function size:0xC
fn_80183314 = .text:0x80183314; // type:function size:0xA0
fn_801833B4 = .text:0x801833B4; // type:function size:0xBC
getCalendarTime16__11RPSysSystemFv = .text:0x80183470; // type:function size:0x4C
Expand Down Expand Up @@ -7309,7 +7309,7 @@ fn_801930F8 = .text:0x801930F8; // type:function size:0x8
fn_80193100 = .text:0x80193100; // type:function size:0x150
fn_80193250 = .text:0x80193250; // type:function size:0x18
fn_80193268 = .text:0x80193268; // type:function size:0x10
fn_80193278 = .text:0x80193278; // type:function size:0x10
createEffect__14RPSysEffectMgrFUlUsUl = .text:0x80193278; // type:function size:0x10
fn_80193288 = .text:0x80193288; // type:function size:0x22C
fn_801934B4 = .text:0x801934B4; // type:function size:0xD0
fn_80193584 = .text:0x80193584; // type:function size:0x7C
Expand Down Expand Up @@ -7448,18 +7448,18 @@ parseDynamicAnmLength__11RPSysLayoutFPCc = .text:0x801976B8; // type:function si
initialize__11RPSysLayoutFv = .text:0x8019778C; // type:function size:0x4
update__14RPSysFrameCtrlFv = .text:0x80197790; // type:function size:0x268
init__14RPSysFrameCtrlFs = .text:0x801979F8; // type:function size:0x30
fn_80197A28 = .text:0x80197A28; // type:function size:0x84
fn_80197AAC = .text:0x80197AAC; // type:function size:0x698
fn_80198144 = .text:0x80198144; // type:function size:0xD4
fn_80198218 = .text:0x80198218; // type:function size:0xB4
fn_801982CC = .text:0x801982CC; // type:function size:0x14
fn_801982E0 = .text:0x801982E0; // type:function size:0x14
fn_801982F4 = .text:0x801982F4; // type:function size:0x38
fn_8019832C = .text:0x8019832C; // type:function size:0x444
fn_80198770 = .text:0x80198770; // type:function size:0x4
fn_80198774 = .text:0x80198774; // type:function size:0x4
fn_80198778 = .text:0x80198778; // type:function size:0x8C
fn_80198804 = .text:0x80198804; // type:function size:0xD4
draw__18RPSysEffectCreatorFRCQ34nw4r2ef8DrawInfoUlUl = .text:0x80197A28; // type:function size:0x84
update__18RPSysEffectCreatorFv = .text:0x80197AAC; // type:function size:0x698
createEffect__18RPSysEffectCreatorFUlUs = .text:0x80198144; // type:function size:0xD4
stopAllEffect__18RPSysEffectCreatorFv = .text:0x80198218; // type:function size:0xB4
getUnk20__18RPSysEffectCreatorFv = .text:0x801982CC; // type:function size:0x14
getEffectSystem__18RPSysEffectCreatorFv = .text:0x801982E0; // type:function size:0x14
setFrameRate__18RPSysEffectCreatorFf = .text:0x801982F4; // type:function size:0x38
createSlowSystem__18RPSysEffectCreatorFv = .text:0x8019832C; // type:function size:0x444
nullCtor1__18RPSysEffectCreatorFv = .text:0x80198770; // type:function size:0x4
nullCtor2__18RPSysEffectCreatorFv = .text:0x80198774; // type:function size:0x4
setResource__18RPSysEffectCreatorFPUcPUc = .text:0x80198778; // type:function size:0x8C
__dt__18RPSysEffectCreatorFv = .text:0x80198804; // type:function size:0xD4
__ct__18RPSysEffectCreatorFUl = .text:0x801988D8; // type:function size:0x90
Initialize__19RPSysWideTextWriterFv = .text:0x80198968; // type:function size:0x28
getFrameMax__14RPSysLytAnmObjFv = .text:0x80198990; // type:function size:0x40
Expand Down Expand Up @@ -7660,20 +7660,20 @@ fn_801A3F08 = .text:0x801A3F08; // type:function size:0x10C
fn_801A4014 = .text:0x801A4014; // type:function size:0xA8
fn_801A40BC = .text:0x801A40BC; // type:function size:0x814
fn_801A48D0 = .text:0x801A48D0; // type:function size:0x60
fn_801A4930 = .text:0x801A4930; // type:function size:0x24
fn_801A4954 = .text:0x801A4954; // type:function size:0x2C
beginDrawScreen__16RPSysHomeMenuMgrFv = .text:0x801A4930; // type:function size:0x24
draw__16RPSysHomeMenuMgrFv = .text:0x801A4954; // type:function size:0x2C
update__16RPSysHomeMenuMgrFv = .text:0x801A4980; // type:function size:0x390
startBlackOut__16RPSysHomeMenuMgrFv = .text:0x801A4D10; // type:function size:0x58
fn_801A4D68 = .text:0x801A4D68; // type:function size:0x124
fn_801A4E8C = .text:0x801A4E8C; // type:function size:0x12C
fn_801A4FB8 = .text:0x801A4FB8; // type:function size:0x224
fn_801A51DC = .text:0x801A51DC; // type:function size:0x68
fn_801A5244 = .text:0x801A5244; // type:function size:0x40
fn_801A5284 = .text:0x801A5284; // type:function size:0x1AC
fn_801A5430 = .text:0x801A5430; // type:function size:0x54
fn_801A5484 = .text:0x801A5484; // type:function size:0x158
clearMenu__16RPSysHomeMenuMgrFv = .text:0x801A4D68; // type:function size:0x124
updateOutside__16RPSysHomeMenuMgrFv = .text:0x801A4E8C; // type:function size:0x12C
LoadResource__16RPSysHomeMenuMgrFv = .text:0x801A4FB8; // type:function size:0x224
init__16RPSysHomeMenuMgrFv = .text:0x801A51DC; // type:function size:0x68
__dt__16RPSysHomeMenuMgrFv = .text:0x801A5244; // type:function size:0x40
__ct__16RPSysHomeMenuMgrFPQ23EGG4Heap = .text:0x801A5284; // type:function size:0x1AC
soundCallBack__16RPSysHomeMenuMgrFiUl = .text:0x801A5430; // type:function size:0x54
drawScreen__Q216RPSysHomeMenuMgr12fileAccessorFv = .text:0x801A5484; // type:function size:0x158
fn_801A55DC = .text:0x801A55DC; // type:function size:0x11C
fn_801A56F8 = .text:0x801A56F8; // type:function size:0x60
CreateInstance__16RPSysHomeMenuMgrFPQ23EGG4Heap = .text:0x801A56F8; // type:function size:0x60
GetValidNum__15RPSysOfficialDBFv = .text:0x801A5758; // type:function size:0xA8
Reset__15RPSysOfficialDBFv = .text:0x801A5800; // type:function size:0x7C
GetIndexFromCreateID__15RPSysOfficialDBFPC11RFLCreateID = .text:0x801A587C; // type:function size:0x44
Expand Down Expand Up @@ -15151,7 +15151,7 @@ lbl_8038338C = .rodata:0x8038338C; // type:object size:0xE data:string
lbl_8038339A = .rodata:0x8038339A; // type:object size:0xE data:string
lbl_803833A8 = .rodata:0x803833A8; // type:object size:0xE data:string
lbl_803833B6 = .rodata:0x803833B6; // type:object size:0x18A
lbl_80383540 = .rodata:0x80383540; // type:object size:0x130
@stringBase0 = .rodata:0x80383540; // type:object size:0x130 data:string_table
TYPE_NAME__Q34nw4r3g3d6ScnRfl = .rodata:0x80383670; // type:object size:0xC scope:global
lbl_80383680 = .rodata:0x80383680; // type:object size:0x18 data:4byte
GEOMETRY_MAGNIFY__10RPGrpModel = .rodata:0x80383698; // type:object size:0x18
Expand Down Expand Up @@ -18628,7 +18628,7 @@ lbl_803B9E00 = .data:0x803B9E00; // type:object size:0xC
lbl_803B9E0C = .data:0x803B9E0C; // type:object size:0xC
@STRING@changeNameToIdRP__13RPSndAudioMgrFPCc@0 = .data:0x803B9E18; // type:object size:0x19 data:string
@STRING@changeNameToIdRP__13RPSndAudioMgrFPCc = .data:0x803B9E38; // type:object size:0x10 data:string
lbl_803B9E48 = .data:0x803B9E48; // type:object size:0x10
__vt__16RPSysHomeMenuMgr = .data:0x803B9E48; // type:object size:0x10
__vt__15RPSysOfficialDB = .data:0x803B9E58; // type:object size:0xC
__vt__23RPSysKokeshiCtrlDataMgr = .data:0x803B9E68; // type:object size:0xC
__vt__19RPSysKokeshiCtrlMgr = .data:0x803B9E78; // type:object size:0xC
Expand Down Expand Up @@ -21891,7 +21891,7 @@ lbl_804BF590 = .sbss:0x804BF590; // type:object size:0x8 align:4 data:float
lbl_804BF598 = .sbss:0x804BF598; // type:object size:0x8 data:4byte
lbl_804BF5A0 = .sbss:0x804BF5A0; // type:object size:0x8 data:4byte
spInstance__16RPSysHomeMenuMgr = .sbss:0x804BF5A8; // type:object size:0x4 data:4byte
lbl_804BF5AC = .sbss:0x804BF5AC; // type:object size:0x4 data:4byte
spHomeMenuArcMgr__16RPSysHomeMenuMgr = .sbss:0x804BF5AC; // type:object size:0x4 data:4byte
sIsBusy__15RPSysPairingMgr = .sbss:0x804BF5B0; // type:object size:0x1 data:byte
sConnectionFlag__22RPSysCoreControllerMgr = .sbss:0x804BF5B8; // type:object size:0x2 data:2byte
sPrevConnectionFlag__22RPSysCoreControllerMgr = .sbss:0x804BF5BA; // type:object size:0x2 data:2byte
Expand Down
73 changes: 45 additions & 28 deletions include/Pack/RPKernel/RPSysHomeMenuMgr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#define RP_KERNEL_HOME_MENU_MGR_H
#include <Pack/types_pack.h>

#include <Pack/RPAudio.h>
#include <Pack/RPSingleton.h>
#include <Pack/RPSystem/RPSysProjectLocal.h>

Expand All @@ -11,49 +12,61 @@
//! @{

/**
* @brief HBM library manager
* @brief Home menu manager
*/
class RPSysHomeMenuMgr {
RP_SINGLETON_DECL_EX(RPSysHomeMenuMgr);

public:
//! This uses its own scheme instead of HBMSelectBtnNum for some reason
enum homeButtonState {
BUTTON_NONE, // used when inactive or returning to Wii Menu
BUTTON_OPEN,
BUTTON_CLOSE, // exiting Home Menu, but game still running
BUTTON_RESET,
BUTTON_MAX
};

struct fileAccessor {
void* file;
BOOL UNK_0x04; // set to 1 if DVD error occurs in function 801A4E8C
u16 UNK_0x08;
u16 UNK_0x0A;
void drawScreen();
};

bool soundCallBack(int unk, u32 id);
void init();
void LoadResource();
void updateOutside();
void clearMenu();
BOOL startBlackOut();
void update();
void draw();
void beginDrawScreen();

bool isOpen() const {
return mIsOpen;
}

/**
* @brief Check if program is exiting/resetting and black out if true
*
* @return BOOL
*/
BOOL startBlackOut();

private:
struct unknownArcStruct {
void* mArcFile;
u32 UNK_0x04; // set to 1 if DVD error occurs in function 801A4E8C
u16 UNK_0x08;
u16 UNK_0x0A;
};

u8 mUNK_0x08; // set to 1 at the end of LoadResource. bool?
bool mUNK_0x09; // checked in 801A4E8C to make sure error has not occurred
bool mUNK_0x0A; // set to true if no DVD error and scene change disabled
bool mIsOpen;
bool mResLoaded; // at 0x08
bool mUNK_0x09;
bool mUNK_0x0A;
bool mIsOpen; // at 0x0B
u8 mUNK_0x0C;
u8 mUNK_0x0D;
u32 mUNK_0x10;
bool mBlackOutCalled; // at 0x0D
homeButtonState mButtonState; // at 0x10
u16 mUNK_0x14;
RPSysProjectLocal* mProjectLocal;
unknownArcStruct* mARC_0x1C;
HBMDataInfo* mMenuDataInfo;
RPSysProjectLocal* mProjectLocal; // at 0x18
fileAccessor* mFileAccessor; // at 0x1C
HBMDataInfo* mMenuDataInfo; // at 0x20
u32 mUNK_0x24;
u32 mUNK_0x28;
u32 mUNK_0x2C;
void* mUNK_0x30;
void* mSoundCallback;
void* mSoundCallback; // at 0x34
u32 mUNK_0x38;
u32 mUNK_0x3C;
u32 mUNK_0x40;
Expand All @@ -62,12 +75,16 @@ class RPSysHomeMenuMgr {
u32 mUNK_0x4C;
f32 mUNK_0x50; // Set to 1.2 if the console is in PAL 50 Hz mode,
// otherwise 1.0
f32 mUNK_0x54;
f32 mUNK_0x58;
f32 mScaleX;
f32 mAdjScaleX;
u32 mUNK_0x5C;
const HBMControllerData* mHbmControllerData;
u8 mUNK_0x64[60];
KPADStatus mKpadStatus;
Vec2 mVec2;
u8 mUNK_0x6C[50];
KPADStatus mKpadStatus; //todo(texline) why is this duped?
u8 mPadding[396];

static RPSndHomeMenuArcMgr* spHomeMenuArcMgr;
};

//! @}
Expand Down
1 change: 1 addition & 0 deletions include/Pack/RPKernel/RPSysSystem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include <Pack/RPSystem/RPSysRenderMode.h>
#include <Pack/RPSystem/RPSysSceneCreator.h>
#include <Pack/RPSystem/RPSysRenderMode.h>

#include <egg/core.h>

Expand Down
3 changes: 3 additions & 0 deletions include/Pack/RPSystem/RPSysPauseMgr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ class RPSysPauseMgr {

private:
u32 unk8;
u32 unkC;
f32 mFloats_0x10[120];
void *mLytPause;
};

//! @}
Expand Down
Loading
Loading