diff --git a/src/game/data/data_020df0.c b/src/game/data/data_020df0.c index a6506b9f2..7af8947c6 100644 --- a/src/game/data/data_020df0.c +++ b/src/game/data/data_020df0.c @@ -10950,7 +10950,7 @@ struct menu_item menuitems_2bd18[] = { // 2bd40 struct menu_dialog menudialog_2bd40 = { MENUDIALOGTYPE_DEFAULT, - (u32)&func0f17dc44, + (u32)&mpMenuTextSelectTuneOrTunes, menuitems_2bd18, menudialogMpSelectTune, 0x00000010, @@ -10962,7 +10962,7 @@ struct menu_item menuitems_mpsoundtrack[] = { { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU(63), 0x00000000, NULL }, // "Current:" { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS(3), (u32)&mpMenuTextCurrentTrack, NULL }, // "" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, (u32)&func0f17dc44, 0x00000000, &menudialog_2bd40 }, + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, (u32)&mpMenuTextSelectTuneOrTunes, 0x00000000, &menudialog_2bd40 }, { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(64), 0x00000000, menuhandlerMpMultipleTunes }, // "Multiple Tunes" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(65), 0x00000000, NULL }, // "Back" diff --git a/src/game/game_179060.c b/src/game/game_179060.c index acb892800..c38f8898b 100644 --- a/src/game/game_179060.c +++ b/src/game/game_179060.c @@ -4698,27 +4698,14 @@ char *menuhandlerMpTeamSlot(u32 operation, struct menu_item *item, s32 *value) return func0f17dac4(operation, item, value); } -GLOBAL_ASM( -glabel func0f17dc44 -/* f17dc44: 27bdffe8 */ addiu $sp,$sp,-24 -/* f17dc48: afbf0014 */ sw $ra,0x14($sp) -/* f17dc4c: 0fc630a9 */ jal mpGetUsingMultipleTunes -/* f17dc50: afa40018 */ sw $a0,0x18($sp) -/* f17dc54: 10400005 */ beqz $v0,.L0f17dc6c -/* f17dc58: 00000000 */ sll $zero,$zero,0x0 -/* f17dc5c: 0fc5b9f1 */ jal langGet -/* f17dc60: 24045045 */ addiu $a0,$zero,0x5045 -/* f17dc64: 10000004 */ beqz $zero,.L0f17dc78 -/* f17dc68: 8fbf0014 */ lw $ra,0x14($sp) -.L0f17dc6c: -/* f17dc6c: 0fc5b9f1 */ jal langGet -/* f17dc70: 24045044 */ addiu $a0,$zero,0x5044 -/* f17dc74: 8fbf0014 */ lw $ra,0x14($sp) -.L0f17dc78: -/* f17dc78: 27bd0018 */ addiu $sp,$sp,0x18 -/* f17dc7c: 03e00008 */ jr $ra -/* f17dc80: 00000000 */ sll $zero,$zero,0x0 -); +char *mpMenuTextSelectTuneOrTunes(struct menu_item *item) +{ + if (mpGetUsingMultipleTunes()) { + return langGet(L_MPMENU(69)); // "Select Tune" + } + + return langGet(L_MPMENU(68)); // "Select Tunes" +} GLOBAL_ASM( glabel menuhandler0017dc84 diff --git a/src/include/game/game_179060.h b/src/include/game/game_179060.h index 26bb1a7a8..f935b607d 100644 --- a/src/include/game/game_179060.h +++ b/src/include/game/game_179060.h @@ -49,7 +49,7 @@ u32 func0f17d378(void); s32 func0f17d4b0(u32 operation, struct menu_item *item, s32 *value, s32 numteams); char *mpMenuTextChrNameForTeamSetup(struct menu_item *item); char *func0f17dac4(u32 operation, struct menu_item *item, s32 *value); -u32 func0f17dc44(void); +char *mpMenuTextSelectTuneOrTunes(struct menu_item *item); s32 menuhandler0017dc84(u32, u32, u32 *); char *mpMenuTextCurrentTrack(struct menu_item *item); s32 menuhandler0017e06c(u32, u32, u32 *);