From 8b8ba97481c8085dd3e02c05ff908ccb7c7c1652 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Wed, 8 Apr 2020 08:23:17 +1000 Subject: [PATCH] Rename a menu handler and document training timer bug --- src/game/data/data_02da90.c | 2 +- src/game/game_1a3340.c | 4 +++- src/include/game/game_1a3340.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/game/data/data_02da90.c b/src/game/data/data_02da90.c index 39778ec88..73924f58b 100644 --- a/src/game/data/data_02da90.c +++ b/src/game/data/data_02da90.c @@ -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 }, }; diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c index 3a299d3a1..4998f9f98 100644 --- a/src/game/game_1a3340.c +++ b/src/game/game_1a3340.c @@ -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(); } diff --git a/src/include/game/game_1a3340.h b/src/include/game/game_1a3340.h index 21c71a795..e113e2582 100644 --- a/src/include/game/game_1a3340.h +++ b/src/include/game/game_1a3340.h @@ -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);