diff --git a/src/game/data/data_0160b0.c b/src/game/data/data_0160b0.c index 94f3ee448..7d9217a62 100644 --- a/src/game/data/data_0160b0.c +++ b/src/game/data/data_0160b0.c @@ -2129,7 +2129,7 @@ struct menu_item menuitems_18b8c[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x000056b7, 0x00000000, &menudialog_controloptions }, // "Control" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x000056b8, 0x00000000, &menudialog_displayoptions }, // "Display" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000064, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, (u32)&func0f1782b8, 0x00000000, menuhandlerMpPause }, + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, (u32)&menutextPauseOrUnpause, 0x00000000, menuhandlerMpPause }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -2140,7 +2140,7 @@ struct menu_item menuitems_18c18[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x000056b7, 0x00000000, &menudialog_controloptions }, // "Control" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x000056b8, 0x00000000, &menudialog_displayoptionsshort }, // "Display" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000064, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, (u32)&func0f1782b8, 0x00000000, menuhandlerMpPause }, + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, (u32)&menutextPauseOrUnpause, 0x00000000, menuhandlerMpPause }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; diff --git a/src/game/data/data_020df0.c b/src/game/data/data_020df0.c index 63fb66b82..4c0b63aaa 100644 --- a/src/game/data/data_020df0.c +++ b/src/game/data/data_020df0.c @@ -10073,7 +10073,7 @@ struct menu_item menuitems_2a6cc[] = { { MENUITEMTYPE_LABEL, 2, 0x00000200, 0x000054a4, (u32)&func0f178050, menuhandlerMpInGameLimitLabel }, // "Team Score Limit:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000000, 0x0000511e, (u32)&func0f1782f8, NULL }, // "Game Time:" - { MENUITEMTYPE_SELECTABLE, 1, 0x00000020, (u32)&func0f1782b8, 0x00000000, menuhandlerMpPause }, + { MENUITEMTYPE_SELECTABLE, 1, 0x00000020, (u32)&menutextPauseOrUnpause, 0x00000000, menuhandlerMpPause }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000024, 0x0000511f, 0x00000000, &menudialog_mpendgame }, // "End Game" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; diff --git a/src/game/game_177e00.c b/src/game/game_177e00.c index 973ce92b5..ab8b69746 100644 --- a/src/game/game_177e00.c +++ b/src/game/game_177e00.c @@ -283,27 +283,14 @@ s32 menuhandlerMpPause(u32 operation, struct menu_item *item, s32 *value) return 0; } -GLOBAL_ASM( -glabel func0f1782b8 -/* f1782b8: 27bdffe8 */ addiu $sp,$sp,-24 -/* f1782bc: afbf0014 */ sw $ra,0x14($sp) -/* f1782c0: 0fc62590 */ jal mpIsPaused -/* f1782c4: afa40018 */ sw $a0,0x18($sp) -/* f1782c8: 10400005 */ beqz $v0,.L0f1782e0 -/* f1782cc: 00000000 */ sll $zero,$zero,0x0 -/* f1782d0: 0fc5b9f1 */ jal langGet -/* f1782d4: 24045121 */ addiu $a0,$zero,0x5121 -/* f1782d8: 10000004 */ beqz $zero,.L0f1782ec -/* f1782dc: 8fbf0014 */ lw $ra,0x14($sp) -.L0f1782e0: -/* f1782e0: 0fc5b9f1 */ jal langGet -/* f1782e4: 24045120 */ addiu $a0,$zero,0x5120 -/* f1782e8: 8fbf0014 */ lw $ra,0x14($sp) -.L0f1782ec: -/* f1782ec: 27bd0018 */ addiu $sp,$sp,0x18 -/* f1782f0: 03e00008 */ jr $ra -/* f1782f4: 00000000 */ sll $zero,$zero,0x0 -); +char *menutextPauseOrUnpause(s32 arg0) +{ + if (mpIsPaused()) { + return langGet(0x5121); // "Unpause" + } + + return langGet(0x5120); // "Pause" +} GLOBAL_ASM( glabel func0f1782f8 diff --git a/src/include/game/game_177e00.h b/src/include/game/game_177e00.h index ae27fc12d..46f7f3935 100644 --- a/src/include/game/game_177e00.h +++ b/src/include/game/game_177e00.h @@ -5,7 +5,7 @@ s32 menuhandler00177e00(u32, u32, u32 *); u32 func0f178050(void); -u32 func0f1782b8(void); +char *menutextPauseOrUnpause(s32 arg0); u32 func0f1782f8(void); u32 func0f178330(void); u32 func0f1783a0(void);