falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename a menu handler and document training timer bug

This commit is contained in:
Ryan Dwyer 2020-04-08 08:23:17 +10:00
parent 1da353ef97
commit 8b8ba97481
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/data/data_02da90.c
View File

@ -1102,7 +1102,7 @@ struct menu_item menuitems_2f424[] = {
{ MENUITEMTYPE_SCROLLABLE, 5, 0x00000000, 0x000000aa, 0x000000be, NULL },
{ MENUITEMTYPE_MODEL, 0, 0x00000003, 0x0000008c, 0x0000009c, NULL },
{ MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL },
{ MENUITEMTYPE_SELECTABLE, 0, 0x00000008, (u32)&dtMenuTextOkOrResume, 0x00000000, menuhandler001a64d8 },
{ MENUITEMTYPE_SELECTABLE, 0, 0x00000008, (u32)&dtMenuTextOkOrResume, 0x00000000, menuhandlerDtOkOrResume },
{ MENUITEMTYPE_SELECTABLE, 0, 0x00000008, (u32)&dtMenuTextCancelOrAbort, 0x00000000, menuhandler001a6514 },
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};

4
src/game/game_1a3340.c
View File

@ -3154,9 +3154,11 @@ glabel func0f1a64a0
/* f1a64d4: 00000000 */ sll $zero,$zero,0x0
);
s32 menuhandler001a64d8(u32 operation, struct menu_item *item, s32 *value)
s32 menuhandlerDtOkOrResume(u32 operation, struct menu_item *item, s32 *value)
{
if (operation == MENUOP_SET) {
// @bug: dtBegin() should not be called if training is already in
// progress. Doing this resets the training timer.
dtBegin();
func0f0f8120();
}

2
src/include/game/game_1a3340.h
View File

@ -52,7 +52,7 @@ s32 menuhandler001a44c0(u32, u32, u32 *);
s32 menuhandlerFrFailedContinue(u32 operation, struct menu_item *item, s32 *value);
s32 menuhandler001a5dc0(u32, u32, u32 *);
s32 menuhandler001a63e4(u32, u32, u32 *);
s32 menuhandler001a64d8(u32 operation, struct menu_item *item, s32 *value);
s32 menuhandlerDtOkOrResume(u32 operation, struct menu_item *item, s32 *value);
s32 menuhandler001a6514(u32 operation, struct menu_item *item, s32 *value);
s32 menuhandler001a6950(u32, u32, u32 *);
s32 menuhandler001a6a34(u32 operation, struct menu_item *item, s32 *value);