diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c index 1a541c190..92006dd09 100644 --- a/src/game/game_1a3340.c +++ b/src/game/game_1a3340.c @@ -3829,24 +3829,14 @@ glabel func0f1a6840 /* f1a6914: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel menudialog001a6918 -/* f1a6918: 27bdffe8 */ addiu $sp,$sp,-24 -/* f1a691c: 24010065 */ addiu $at,$zero,0x65 -/* f1a6920: afbf0014 */ sw $ra,0x14($sp) -/* f1a6924: afa5001c */ sw $a1,0x1c($sp) -/* f1a6928: 14810004 */ bne $a0,$at,.L0f1a693c -/* f1a692c: afa60020 */ sw $a2,0x20($sp) -/* f1a6930: 00002025 */ or $a0,$zero,$zero -/* f1a6934: 0fc127cb */ jal chrSetStageFlag -/* f1a6938: 3c050800 */ lui $a1,0x800 -.L0f1a693c: -/* f1a693c: 8fbf0014 */ lw $ra,0x14($sp) -/* f1a6940: 27bd0018 */ addiu $sp,$sp,0x18 -/* f1a6944: 00001025 */ or $v0,$zero,$zero -/* f1a6948: 03e00008 */ jr $ra -/* f1a694c: 00000000 */ sll $zero,$zero,0x0 -); +bool menudialogDeviceTrainingResults(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem) +{ + if (operation == MENUOP_101) { + chrSetStageFlag(NULL, 0x08000000); + } + + return false; +} GLOBAL_ASM( glabel menuhandler001a6950 diff --git a/src/include/game/game_1a3340.h b/src/include/game/game_1a3340.h index 8c8e4d6df..6dc041979 100644 --- a/src/include/game/game_1a3340.h +++ b/src/include/game/game_1a3340.h @@ -41,7 +41,7 @@ s32 menudialog001a39a8(u32, u32, u32 *); s32 menudialog001a3af4(u32, u32, u32 *); s32 menudialog001a5f48(u32, u32, u32 *); s32 menudialog001a6548(u32, u32, u32 *); -s32 menudialog001a6918(u32, u32, u32 *); +bool menudialogDeviceTrainingResults(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem); s32 menudialog001a6aa4(u32, u32, u32 *); bool menudialogFiringRangeResults(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem); s32 menudialog001a737c(u32, u32, u32 *); diff --git a/src/setup/setup_020df0.c b/src/setup/setup_020df0.c index 36e72a427..b2d16bc2c 100644 --- a/src/setup/setup_020df0.c +++ b/src/setup/setup_020df0.c @@ -13277,7 +13277,7 @@ struct menu_dialog menudialog_trainingstats_failed = { MENUDIALOGTYPE_DANGER, 0x000051a7, // "Training Stats" menuitems_trainingstats_failed, - menudialog001a6918, + menudialogDeviceTrainingResults, 0x00000200, &menudialog_devicelist, }; @@ -13297,7 +13297,7 @@ struct menu_dialog menudialog_trainingstats_completed = { MENUDIALOGTYPE_SUCCESS, 0x51a7, menuitems_trainingstats_completed, - menudialog001a6918, + menudialogDeviceTrainingResults, 0x00000200, &menudialog_devicelist, };