diff --git a/src/game/data/data_020df0.c b/src/game/data/data_020df0.c index 1c5c73c21..5e502c317 100644 --- a/src/game/data/data_020df0.c +++ b/src/game/data/data_020df0.c @@ -10474,11 +10474,11 @@ struct menu_dialog menudialog_mpweapons = { struct menu_item menuitems_mpweapons2[] = { { MENUITEMTYPE_DROPDOWN, 0, 0x00020090, L_MPMENU(174), 0x00000000, menuhandlerMpWeaponSetDropdown }, // "Set:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(176), (u32)&func0f17960c, NULL }, // "1:" - { MENUITEMTYPE_LABEL, 1, 0x00000002, L_MPMENU(177), (u32)&func0f17960c, NULL }, // "2:" - { MENUITEMTYPE_LABEL, 2, 0x00000002, L_MPMENU(178), (u32)&func0f17960c, NULL }, // "3:" - { MENUITEMTYPE_LABEL, 3, 0x00000002, L_MPMENU(179), (u32)&func0f17960c, NULL }, // "4:" - { MENUITEMTYPE_LABEL, 4, 0x00000002, L_MPMENU(180), (u32)&func0f17960c, NULL }, // "5:" + { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(176), (u32)&mpMenuTextWeaponNameForSlot, NULL }, // "1:" + { MENUITEMTYPE_LABEL, 1, 0x00000002, L_MPMENU(177), (u32)&mpMenuTextWeaponNameForSlot, NULL }, // "2:" + { MENUITEMTYPE_LABEL, 2, 0x00000002, L_MPMENU(178), (u32)&mpMenuTextWeaponNameForSlot, NULL }, // "3:" + { MENUITEMTYPE_LABEL, 3, 0x00000002, L_MPMENU(179), (u32)&mpMenuTextWeaponNameForSlot, NULL }, // "4:" + { MENUITEMTYPE_LABEL, 4, 0x00000002, L_MPMENU(180), (u32)&mpMenuTextWeaponNameForSlot, NULL }, // "5:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(182), 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, diff --git a/src/game/game_179060.c b/src/game/game_179060.c index a221d8f44..05cd66a83 100644 --- a/src/game/game_179060.c +++ b/src/game/game_179060.c @@ -452,19 +452,10 @@ char *menuhandlerMpWeaponSlot(u32 operation, struct menu_item *item, s32 *value) return 0; } -GLOBAL_ASM( -glabel func0f17960c -/* f17960c: 27bdffe8 */ addiu $sp,$sp,-24 -/* f179610: afbf0014 */ sw $ra,0x14($sp) -/* f179614: 0fc62365 */ jal mpGetWeaponSlot -/* f179618: 90840001 */ lbu $a0,0x1($a0) -/* f17961c: 0fc6230f */ jal mpGetWeaponLabel -/* f179620: 00402025 */ or $a0,$v0,$zero -/* f179624: 8fbf0014 */ lw $ra,0x14($sp) -/* f179628: 27bd0018 */ addiu $sp,$sp,0x18 -/* f17962c: 03e00008 */ jr $ra -/* f179630: 00000000 */ sll $zero,$zero,0x0 -); +char *mpMenuTextWeaponNameForSlot(struct menu_item *item) +{ + return mpGetWeaponLabel(mpGetWeaponSlot(item->param)); +} s32 menuhandlerMpWeaponSetDropdown(u32 operation, struct menu_item *item, s32 *value) { diff --git a/src/include/game/game_179060.h b/src/include/game/game_179060.h index 045d29261..436817853 100644 --- a/src/include/game/game_179060.h +++ b/src/include/game/game_179060.h @@ -6,7 +6,7 @@ char *mpGetCurrentPlayerName(struct menu_item *item); u32 func0f179104(void); s32 menuhandler001791c8(u32, u32, u32 *); -u32 func0f17960c(void); +char *mpMenuTextWeaponNameForSlot(struct menu_item *item); u32 func0f179b58(void); s32 func0f179da4(u32 operation, struct menu_item *item, s32 *value, s32 arg3, s32 arg4, s32 arg5); s32 menudialog0017a174(u32, u32, u32 *);