diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c index 0eec44a45..1a541c190 100644 --- a/src/game/game_1a3340.c +++ b/src/game/game_1a3340.c @@ -4069,24 +4069,14 @@ glabel func0f1a6b7c /* f1a6c50: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel menudialog001a6c54 -/* f1a6c54: 27bdffe8 */ addiu $sp,$sp,-24 -/* f1a6c58: 24010065 */ addiu $at,$zero,0x65 -/* f1a6c5c: afbf0014 */ sw $ra,0x14($sp) -/* f1a6c60: afa5001c */ sw $a1,0x1c($sp) -/* f1a6c64: 14810004 */ bne $a0,$at,.L0f1a6c78 -/* f1a6c68: afa60020 */ sw $a2,0x20($sp) -/* f1a6c6c: 00002025 */ or $a0,$zero,$zero -/* f1a6c70: 0fc127cb */ jal chrSetStageFlag -/* f1a6c74: 3c050800 */ lui $a1,0x800 -.L0f1a6c78: -/* f1a6c78: 8fbf0014 */ lw $ra,0x14($sp) -/* f1a6c7c: 27bd0018 */ addiu $sp,$sp,0x18 -/* f1a6c80: 00001025 */ or $v0,$zero,$zero -/* f1a6c84: 03e00008 */ jr $ra -/* f1a6c88: 00000000 */ sll $zero,$zero,0x0 -); +bool menudialogFiringRangeResults(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem) +{ + if (operation == MENUOP_101) { + chrSetStageFlag(NULL, 0x08000000); + } + + return false; +} GLOBAL_ASM( glabel func0f1a6c8c diff --git a/src/include/constants.h b/src/include/constants.h index ae36081f5..1279e68f2 100644 --- a/src/include/constants.h +++ b/src/include/constants.h @@ -483,6 +483,7 @@ #define MENUOP_SETTEXT 18 #define MENUOP_CHECKHIDDEN 24 #define MENUOP_100 100 +#define MENUOP_101 101 #define MPLOCKTYPE_NONE 0 #define MPLOCKTYPE_LASTWINNER 1 diff --git a/src/include/game/game_1a3340.h b/src/include/game/game_1a3340.h index b2f027a0d..8c8e4d6df 100644 --- a/src/include/game/game_1a3340.h +++ b/src/include/game/game_1a3340.h @@ -43,7 +43,7 @@ s32 menudialog001a5f48(u32, u32, u32 *); s32 menudialog001a6548(u32, u32, u32 *); s32 menudialog001a6918(u32, u32, u32 *); s32 menudialog001a6aa4(u32, u32, u32 *); -s32 menudialog001a6c54(u32, u32, u32 *); +bool menudialogFiringRangeResults(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem); s32 menudialog001a737c(u32, u32, u32 *); s32 menuhandler001a3340(u32, u32, u32 *); s32 menuhandler001a3448(u32 operation, struct menu_item *item, s32 *value); diff --git a/src/setup/setup_020df0.c b/src/setup/setup_020df0.c index 1490bfb4e..36e72a427 100644 --- a/src/setup/setup_020df0.c +++ b/src/setup/setup_020df0.c @@ -13353,7 +13353,7 @@ struct menu_dialog menudialog_trainingstats_failed2 = { MENUDIALOGTYPE_DANGER, 0x51a7, // "Training Stats" menuitems_trainingstats_failed2, - menudialog001a6c54, + menudialogFiringRangeResults, 0x00000200, &menudialog_holotraining, }; @@ -13373,7 +13373,7 @@ struct menu_dialog menudialog_trainingstats_completed2 = { MENUDIALOGTYPE_SUCCESS, 0x51a7, // "Training Stats" menuitems_trainingstats_completed2, - menudialog001a6c54, + menudialogFiringRangeResults, 0x00000200, &menudialog_holotraining, };