diff --git a/src/game/data/data_020df0.c b/src/game/data/data_020df0.c index 366ad2273..6148477dc 100644 --- a/src/game/data/data_020df0.c +++ b/src/game/data/data_020df0.c @@ -12931,7 +12931,7 @@ struct menu_item menuitems_frtrainingstats[] = { { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(452), (u32)&frMenuTextDifficultyName, NULL }, // "Difficulty:" { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(453), (u32)&frMenuTextTimeTakenValue, NULL }, // "Time Taken:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(454), (u32)&func0f1a3fc0, NULL }, // "Weapon:" + { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(454), (u32)&frMenuTextWeaponName, NULL }, // "Weapon:" { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(455), (u32)&func0f1a402c, NULL }, // "Accuracy:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_MODEL, 0, 0x00200002, 0x000000d2, 0x00000050, menuhandler001a44c0 }, @@ -12958,7 +12958,7 @@ struct menu_item menuitems_frtrainingstats2[] = { { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(452), (u32)&frMenuTextDifficultyName, NULL }, // "Difficulty:" { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(453), (u32)&frMenuTextTimeTakenValue, NULL }, // "Time Taken:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(454), (u32)&func0f1a3fc0, NULL }, // "Weapon:" + { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(454), (u32)&frMenuTextWeaponName, NULL }, // "Weapon:" { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(455), (u32)&func0f1a402c, NULL }, // "Accuracy:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_MODEL, 0, 0x00200002, 0x000000d2, 0x00000050, menuhandler001a44c0 }, diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c index 71adfa43c..b4b060039 100644 --- a/src/game/game_1a3340.c +++ b/src/game/game_1a3340.c @@ -884,21 +884,10 @@ glabel func0f1a3f84 /* f1a3fbc: 27bd0018 */ addiu $sp,$sp,0x18 ); -GLOBAL_ASM( -glabel func0f1a3fc0 -/* f1a3fc0: 27bdffe8 */ addiu $sp,$sp,-24 -/* f1a3fc4: afbf0014 */ sw $ra,0x14($sp) -/* f1a3fc8: 0fc67494 */ jal func0f19d250 -/* f1a3fcc: afa40018 */ sw $a0,0x18($sp) -/* f1a3fd0: 0fc6749a */ jal func0f19d268 -/* f1a3fd4: 00402025 */ or $a0,$v0,$zero -/* f1a3fd8: 0fc28857 */ jal weaponGetName -/* f1a3fdc: 00402025 */ or $a0,$v0,$zero -/* f1a3fe0: 8fbf0014 */ lw $ra,0x14($sp) -/* f1a3fe4: 27bd0018 */ addiu $sp,$sp,0x18 -/* f1a3fe8: 03e00008 */ jr $ra -/* f1a3fec: 00000000 */ sll $zero,$zero,0x0 -); +char *frMenuTextWeaponName(struct menu_item *item) +{ + return weaponGetName(func0f19d268(func0f19d250())); +} const char var7f1b97fc[] = "%d\n"; diff --git a/src/include/game/game_1a3340.h b/src/include/game/game_1a3340.h index 8846ad79e..ebabb7d49 100644 --- a/src/include/game/game_1a3340.h +++ b/src/include/game/game_1a3340.h @@ -7,7 +7,7 @@ u32 func0f1a3d98(void); char *frMenuTextDifficultyName(struct menu_item *item); char *frMenuTextTimeTakenValue(struct menu_item *item); char *frMenuTextScoreValue(struct menu_item *item); -u32 func0f1a3fc0(void); +char *frMenuTextWeaponName(struct menu_item *item); char *frMenuTextTargetsDestroyedValue(struct menu_item *item); u32 func0f1a402c(void); char *frMenuTextGoalScoreLabel(struct menu_item *item);