Skip to content

Name helpRVL functions #97

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
Yanis002 merged 2 commits into from
Oct 5, 2025
Merged

Name helpRVL functions #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1aed350
name helpRVL functions
Yanis002 Oct 4, 2025
b1fe6d1
helpMenuSetupSize -> helpMenuAllocate
Yanis002 Oct 4, 2025
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
30 changes: 15 additions & 15 deletions config/oot-e/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,21 +784,21 @@ libraryFunctionReplaced = .text:0x8005D554; // type:function size:0xC0
libraryCall = .text:0x8005D614; // type:function size:0xE8
libraryEvent = .text:0x8005D6FC; // type:function size:0xBA0
codeEvent = .text:0x8005E29C; // type:function size:0x34
fn_8005E2D0 = .text:0x8005E2D0; // type:function size:0x18C
fn_8005E45C = .text:0x8005E45C; // type:function size:0x1DC
fn_8005E638 = .text:0x8005E638; // type:function size:0x1C8
fn_8005E800 = .text:0x8005E800; // type:function size:0x2FC
fn_8005EAFC = .text:0x8005EAFC; // type:function size:0x300
fn_8005EDFC = .text:0x8005EDFC; // type:function size:0x358
fn_8005F154 = .text:0x8005F154; // type:function size:0x4C
fn_8005F1A0 = .text:0x8005F1A0; // type:function size:0x4C
fn_8005F1EC = .text:0x8005F1EC; // type:function size:0x8
fn_8005F1F4 = .text:0x8005F1F4; // type:function size:0x4D0
fn_8005F5F4 = .text:0x8005F6C4; // type:function size:0x100
fn_8005F6F4 = .text:0x8005F7C4; // type:function size:0xF0
fn_8005F7E4 = .text:0x8005F8B4; // type:function size:0xFCC
fn_800607B0 = .text:0x80060880; // type:function size:0x14
fn_800607C4 = .text:0x80060894; // type:function size:0xEC
helpMenuReadNAND = .text:0x8005E2D0; // type:function size:0x18C
helpMenuSetupTexturedQuad = .text:0x8005E45C; // type:function size:0x1DC
helpMenuSetupColoredQuad = .text:0x8005E638; // type:function size:0x1C8
helpMenu_8005E800 = .text:0x8005E800; // type:function size:0x2FC
helpMenu_8005EAFC = .text:0x8005EAFC; // type:function size:0x300
helpMenu_8005EDFC = .text:0x8005EDFC; // type:function size:0x358
helpMenuPowerCallback = .text:0x8005F154; // type:function size:0x4C
helpMenuResetCallback = .text:0x8005F1A0; // type:function size:0x4C
helpMenuSoundCallback = .text:0x8005F1EC; // type:function size:0x8
helpMenuInit = .text:0x8005F1F4; // type:function size:0x4D0
helpMenuAllocate = .text:0x8005F6C4; // type:function size:0x100
helpMenuAllocateFile = .text:0x8005F7C4; // type:function size:0xF0
helpMenuUpdate = .text:0x8005F8B4; // type:function size:0xFCC
helpMenu_800607B0 = .text:0x80060880; // type:function size:0x14
helpMenu_800607C4 = .text:0x80060894; // type:function size:0xEC
helpMenuEvent = .text:0x80060980; // type:function size:0x19C
soundWipeBuffers = .text:0x80060B1C; // type:function size:0x10C
soundMakeRamp = .text:0x80060C28; // type:function size:0x44C scope:local
Expand Down
30 changes: 15 additions & 15 deletions config/oot-j/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,21 +784,21 @@ libraryFunctionReplaced = .text:0x8005D554; // type:function size:0xC0
libraryCall = .text:0x8005D614; // type:function size:0xE8
libraryEvent = .text:0x8005D6FC; // type:function size:0xBA0
codeEvent = .text:0x8005E29C; // type:function size:0x34
fn_8005E2D0 = .text:0x8005E2D0; // type:function size:0x18C
fn_8005E45C = .text:0x8005E45C; // type:function size:0x1DC
fn_8005E638 = .text:0x8005E638; // type:function size:0x1C8
fn_8005E800 = .text:0x8005E800; // type:function size:0x2FC
fn_8005EAFC = .text:0x8005EAFC; // type:function size:0x300
fn_8005EDFC = .text:0x8005EDFC; // type:function size:0x358
fn_8005F154 = .text:0x8005F154; // type:function size:0x4C
fn_8005F1A0 = .text:0x8005F1A0; // type:function size:0x4C
fn_8005F1EC = .text:0x8005F1EC; // type:function size:0x8
fn_8005F1F4 = .text:0x8005F1F4; // type:function size:0x400
fn_8005F5F4 = .text:0x8005F5F4; // type:function size:0x100
fn_8005F6F4 = .text:0x8005F6F4; // type:function size:0xF0
fn_8005F7E4 = .text:0x8005F7E4; // type:function size:0xFCC
fn_800607B0 = .text:0x800607B0; // type:function size:0x14
fn_800607C4 = .text:0x800607C4; // type:function size:0xEC
helpMenuReadNAND = .text:0x8005E2D0; // type:function size:0x18C
helpMenuSetupTexturedQuad = .text:0x8005E45C; // type:function size:0x1DC
helpMenuSetupColoredQuad = .text:0x8005E638; // type:function size:0x1C8
helpMenu_8005E800 = .text:0x8005E800; // type:function size:0x2FC
helpMenu_8005EAFC = .text:0x8005EAFC; // type:function size:0x300
helpMenu_8005EDFC = .text:0x8005EDFC; // type:function size:0x358
helpMenuPowerCallback = .text:0x8005F154; // type:function size:0x4C
helpMenuResetCallback = .text:0x8005F1A0; // type:function size:0x4C
helpMenuSoundCallback = .text:0x8005F1EC; // type:function size:0x8
helpMenuInit = .text:0x8005F1F4; // type:function size:0x400
helpMenuAllocate = .text:0x8005F5F4; // type:function size:0x100
helpMenuAllocateFile = .text:0x8005F6F4; // type:function size:0xF0
helpMenuUpdate = .text:0x8005F7E4; // type:function size:0xFCC
helpMenu_800607B0 = .text:0x800607B0; // type:function size:0x14
helpMenu_800607C4 = .text:0x800607C4; // type:function size:0xEC
helpMenuEvent = .text:0x800608B0; // type:function size:0x19C
soundWipeBuffers = .text:0x80060A4C; // type:function size:0x10C
soundMakeRamp = .text:0x80060B58; // type:function size:0x44C scope:local
Expand Down
30 changes: 15 additions & 15 deletions config/oot-u/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,21 +784,21 @@ libraryFunctionReplaced = .text:0x8005D570; // type:function size:0xC0
libraryCall = .text:0x8005D630; // type:function size:0xE8
libraryEvent = .text:0x8005D718; // type:function size:0xBA0
codeEvent = .text:0x8005E2B8; // type:function size:0x34
fn_8005E2D0 = .text:0x8005E2EC; // type:function size:0x18C
fn_8005E45C = .text:0x8005E478; // type:function size:0x1DC
fn_8005E638 = .text:0x8005E654; // type:function size:0x1C8
fn_8005E800 = .text:0x8005E81C; // type:function size:0x2FC
fn_8005EAFC = .text:0x8005EB18; // type:function size:0x300
fn_8005EDFC = .text:0x8005EE18; // type:function size:0x358
fn_8005F154 = .text:0x8005F170; // type:function size:0x4C
fn_8005F1A0 = .text:0x8005F1BC; // type:function size:0x4C
fn_8005F1EC = .text:0x8005F208; // type:function size:0x8
fn_8005F1F4 = .text:0x8005F210; // type:function size:0x474
fn_8005F5F4 = .text:0x8005F684; // type:function size:0x100
fn_8005F6F4 = .text:0x8005F784; // type:function size:0xF0
fn_8005F7E4 = .text:0x8005F874; // type:function size:0xFCC
fn_800607B0 = .text:0x80060840; // type:function size:0x14
fn_800607C4 = .text:0x80060854; // type:function size:0xEC
helpMenuReadNAND = .text:0x8005E2EC; // type:function size:0x18C
helpMenuSetupTexturedQuad = .text:0x8005E478; // type:function size:0x1DC
helpMenuSetupColoredQuad = .text:0x8005E654; // type:function size:0x1C8
helpMenu_8005E800 = .text:0x8005E81C; // type:function size:0x2FC
helpMenu_8005EAFC = .text:0x8005EB18; // type:function size:0x300
helpMenu_8005EDFC = .text:0x8005EE18; // type:function size:0x358
helpMenuPowerCallback = .text:0x8005F170; // type:function size:0x4C
helpMenuResetCallback = .text:0x8005F1BC; // type:function size:0x4C
helpMenuSoundCallback = .text:0x8005F208; // type:function size:0x8
helpMenuInit = .text:0x8005F210; // type:function size:0x474
helpMenuAllocate = .text:0x8005F684; // type:function size:0x100
helpMenuAllocateFile = .text:0x8005F784; // type:function size:0xF0
helpMenuUpdate = .text:0x8005F874; // type:function size:0xFCC
helpMenu_800607B0 = .text:0x80060840; // type:function size:0x14
helpMenu_800607C4 = .text:0x80060854; // type:function size:0xEC
helpMenuEvent = .text:0x80060940; // type:function size:0x19C
soundWipeBuffers = .text:0x80060ADC; // type:function size:0x10C
soundMakeRamp = .text:0x80060BE8; // type:function size:0x44C scope:local
Expand Down
14 changes: 7 additions & 7 deletions include/emulator/helpRVL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ typedef bool (*HelpMenuCallback)(void);

typedef struct struct_801C7D28 {
/* 0x00 */ TPLPalette* pTPLPalette;
/* 0x04 */ s32 unk04;
/* 0x04 */ bool unk04;
/* 0x08 */ u32 unk08;
/* 0x0C */ s8 unk0C;
/* 0x0D */ u8 unk0D;
Expand All @@ -23,8 +23,8 @@ typedef struct struct_801C7D28 {
typedef struct HelpMenu {
/* 0x00 */ s32 unk00;
/* 0x04 */ s32 unk04;
/* 0x08 */ s32 unk08;
/* 0x0C */ s32 unk0C;
/* 0x08 */ bool unk08;
/* 0x0C */ bool unk0C;
/* 0x10 */ s32 unk10;
/* 0x14 */ void* unk14;
/* 0x18 */ s32 unk18;
Expand All @@ -33,10 +33,10 @@ typedef struct HelpMenu {
/* 0x24 */ HelpMenuCallback unk24[8];
} HelpMenu; // size = 0x28

bool fn_8005F5F4(HelpMenu* pHelpMenu, void* pObject, s32 nByteCount, HelpMenuCallback callback);
s32 fn_8005F7E4(HelpMenu* pHelpMenu);
bool fn_800607B0(HelpMenu* pHelpMenu, s32 arg1);
bool fn_800607C4(HelpMenu* pHelpMenu, s32 arg1);
bool helpMenuAllocate(HelpMenu* pHelpMenu, void* pObject, s32 nByteCount, HelpMenuCallback callback);
s32 helpMenuUpdate(HelpMenu* pHelpMenu);
bool helpMenu_800607B0(HelpMenu* pHelpMenu, bool arg1);
bool helpMenu_800607C4(HelpMenu* pHelpMenu, bool arg1);
bool helpMenuEvent(HelpMenu* pHelpMenu, s32 nEvent, void* pArgument);

extern _XL_OBJECTTYPE gClassHelpMenu;
Expand Down
4 changes: 2 additions & 2 deletions src/emulator/controller.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ static bool fn_80080C04(Controller* pController, ErrorIndex iString) {
errorDisplayShow(iString);
pController->iString = ERROR_NONE;

if (!fn_800607C4(SYSTEM_HELP(gpSystem), 0)) {
if (!helpMenu_800607C4(SYSTEM_HELP(gpSystem), false)) {
return false;
}

Expand Down Expand Up @@ -473,7 +473,7 @@ static bool fn_800623F4(Controller* pController) {
pController->stickRight[i][AXIS_Y] = var_r17;

if ((pController->unk_BC[i] & 0x10) && !(pController->unk_CC[i] & 0x10) &&
!fn_800607C4(SYSTEM_HELP(gpSystem), 1)) {
!helpMenu_800607C4(SYSTEM_HELP(gpSystem), true)) {
return 0;
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/emulator/errordisplay.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@ bool errorDisplayShow(ErrorIndex iString) {

string.iString = ERROR_NONE;

if (!fn_800607B0(SYSTEM_HELP(gpSystem), 0)) {
if (!helpMenu_800607B0(SYSTEM_HELP(gpSystem), false)) {
return false;
}

Expand All @@ -671,12 +671,12 @@ bool errorDisplayShow(ErrorIndex iString) {
xlCoreBeforeRender();
errorDisplayDrawSetup();
errorDisplayPrint(&string);
fn_8005F7E4(SYSTEM_HELP(gpSystem));
helpMenuUpdate(SYSTEM_HELP(gpSystem));
simulatorDEMODoneRender();
nResult = fn_80063688(&string, var_r31 & (var_r31 ^ var_r30));
} while (nResult == 0);

if (fn_800607B0(SYSTEM_HELP(gpSystem), 1)) {
if (helpMenu_800607B0(SYSTEM_HELP(gpSystem), true)) {
return nResult != 1;
}

Expand Down
8 changes: 4 additions & 4 deletions src/emulator/frame.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3339,7 +3339,7 @@ bool frameEnd(Frame* pFrame) {
return false;
}

if (!fn_8005F7E4(SYSTEM_HELP(gpSystem))) {
if (!helpMenuUpdate(SYSTEM_HELP(gpSystem))) {
return false;
}

Expand Down Expand Up @@ -3528,9 +3528,9 @@ bool fn_8005329C(Frame* pFrame, s32 r, s32 g, s32 b) {
}

static inline bool frameEvent_UnknownInline(Frame* pFrame) {
if (!fn_8005F5F4(SYSTEM_HELP(gpSystem), &pFrame->aPixelData, 0x30300000, &frameSetupCache)) {
if (!helpMenuAllocate(SYSTEM_HELP(gpSystem), &pFrame->aPixelData, 0x30300000, &frameSetupCache)) {
return false;
} else if (!fn_8005F5F4(SYSTEM_HELP(gpSystem), &pFrame->aColorData, 0x30050000, &frameSetupCache)) {
} else if (!helpMenuAllocate(SYSTEM_HELP(gpSystem), &pFrame->aColorData, 0x30050000, &frameSetupCache)) {
return false;
}

Expand Down Expand Up @@ -3628,7 +3628,7 @@ bool frameEvent(Frame* pFrame, s32 nEvent, void* pArgument) {
pFrame->nCopyBuffer = NULL;
pFrame->nCameraBuffer = NULL;

if (!fn_8005F5F4(SYSTEM_HELP(gpSystem), &pFrame->nTempBuffer, 0x30025800, NULL)) {
if (!helpMenuAllocate(SYSTEM_HELP(gpSystem), &pFrame->nTempBuffer, 0x30025800, NULL)) {
return false;
}

Expand Down
Loading