diff --git a/src/game/game_176d70.c b/src/game/game_176d70.c index 983e85f19..1cd28f096 100644 --- a/src/game/game_176d70.c +++ b/src/game/game_176d70.c @@ -8674,19 +8674,14 @@ glabel menudialog0017f0b0 /* f17f0d8: 00001025 */ or $v0,$zero,$zero ); -GLOBAL_ASM( -glabel menudialog0017f0dc -/* f17f0dc: 24010064 */ addiu $at,$zero,0x64 -/* f17f0e0: afa50004 */ sw $a1,0x4($sp) -/* f17f0e4: 14810004 */ bne $a0,$at,.L0f17f0f8 -/* f17f0e8: afa60008 */ sw $a2,0x8($sp) -/* f17f0ec: 240e0003 */ addiu $t6,$zero,0x3 -/* f17f0f0: 3c01800a */ lui $at,0x800a -/* f17f0f4: ac2ea450 */ sw $t6,-0x5bb0($at) -.L0f17f0f8: -/* f17f0f8: 03e00008 */ jr $ra -/* f17f0fc: 00001025 */ or $v0,$zero,$zero -); +bool menudialogMpQuickGo(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem) +{ + if (operation == MENUOP_100) { + g_Vars.unk000490 = 3; + } + + return false; +} GLOBAL_ASM( glabel func0f17f100 diff --git a/src/include/constants.h b/src/include/constants.h index c5ecb54b9..ae36081f5 100644 --- a/src/include/constants.h +++ b/src/include/constants.h @@ -482,6 +482,7 @@ #define MENUOP_GETTEXT 17 #define MENUOP_SETTEXT 18 #define MENUOP_CHECKHIDDEN 24 +#define MENUOP_100 100 #define MPLOCKTYPE_NONE 0 #define MPLOCKTYPE_LASTWINNER 1 diff --git a/src/include/game/game_176d70.h b/src/include/game/game_176d70.h index 42e23fb36..e99f6edc1 100644 --- a/src/include/game/game_176d70.h +++ b/src/include/game/game_176d70.h @@ -177,7 +177,7 @@ s32 menudialog0017df74(u32, u32, u32 *); s32 menudialog0017e3fc(u32, u32, u32 *); s32 menudialog0017eb34(u32, u32, u32 *); s32 menudialog0017f0b0(u32, u32, u32 *); -s32 menudialog0017f0dc(u32, u32, u32 *); +bool menudialogMpQuickGo(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem); s32 menudialog0017f930(u32, u32, u32 *); s32 menudialog00184ec0(u32, u32, u32 *); s32 menuhandler00177e00(u32, u32, u32 *); diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index 9b3e3e62a..22efbab0b 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -160,7 +160,7 @@ struct g_vars { /*000484*/ s32 mphilltime; /*000488*/ u32 unk000488; /*00048c*/ u32 unk00048c; - /*000490*/ u32 unk000490; // set to 2 when entering combat simulator + /*000490*/ u32 unk000490; // set to 2 when entering combat simulator, 3 when entering Quick Go /*000494*/ u32 unk000494; /*000498*/ u32 unk000498; /*00049c*/ u32 unk00049c; diff --git a/src/setup/setup_0160b0.c b/src/setup/setup_0160b0.c index ceb74ed3b..56a049c9f 100644 --- a/src/setup/setup_0160b0.c +++ b/src/setup/setup_0160b0.c @@ -3753,7 +3753,7 @@ struct menu_dialog menudialog_mpquickgo2 = { MENUDIALOGTYPE_DEFAULT, 0x59cc, // "Quick Go" menuitems_mpquickgo2, - menudialog0017f0dc, + menudialogMpQuickGo, 0x00000000, NULL, }; diff --git a/src/setup/setup_020df0.c b/src/setup/setup_020df0.c index 3b8329e49..58f706ff7 100644 --- a/src/setup/setup_020df0.c +++ b/src/setup/setup_020df0.c @@ -11212,7 +11212,7 @@ struct menu_dialog g_MpQuickGoMenuDialog = { MENUDIALOGTYPE_DEFAULT, 0x59cc, // "Quick Go" menuitems_mpquickgo, - menudialog0017f0dc, + menudialogMpQuickGo, 0x00000000, NULL, };