diff --git a/src/game/game_102240.c b/src/game/game_102240.c index d417b4e4f..bb8f931c2 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -4070,7 +4070,7 @@ glabel menuhandler00106178 /* f1061b8: 10000071 */ beqz $zero,.L0f106380 /* f1061bc: ade20000 */ sw $v0,0x0($t7) /* f1061c0: 8fb80028 */ lw $t8,0x28($sp) -/* f1061c4: 0fc44b7f */ jal func0f112dfc +/* f1061c4: 0fc44b7f */ jal currentPlayerGetInvNameByIndex /* f1061c8: 8f040000 */ lw $a0,0x0($t8) /* f1061cc: 1000006e */ beqz $zero,.L0f106388 /* f1061d0: 8fbf0014 */ lw $ra,0x14($sp) diff --git a/src/game/game_111600.c b/src/game/game_111600.c index 43cfe6c31..1524b8590 100644 --- a/src/game/game_111600.c +++ b/src/game/game_111600.c @@ -1389,19 +1389,10 @@ u16 currentPlayerGetInvNameIdByIndex(s32 index) return func0f0a21a4(weaponnum); } -GLOBAL_ASM( -glabel func0f112dfc -/* f112dfc: 27bdffe8 */ addiu $sp,$sp,-24 -/* f112e00: afbf0014 */ sw $ra,0x14($sp) -/* f112e04: 0fc44b3e */ jal currentPlayerGetInvNameIdByIndex -/* f112e08: 00000000 */ sll $zero,$zero,0x0 -/* f112e0c: 0fc5b9f1 */ jal langGet -/* f112e10: 00402025 */ or $a0,$v0,$zero -/* f112e14: 8fbf0014 */ lw $ra,0x14($sp) -/* f112e18: 27bd0018 */ addiu $sp,$sp,0x18 -/* f112e1c: 03e00008 */ jr $ra -/* f112e20: 00000000 */ sll $zero,$zero,0x0 -); +char *currentPlayerGetInvNameByIndex(s32 index) +{ + return langGet(currentPlayerGetInvNameIdByIndex(index)); +} GLOBAL_ASM( glabel func0f112e24 diff --git a/src/include/game/game_111600.h b/src/include/game/game_111600.h index 36cb93d7b..0b6531929 100644 --- a/src/include/game/game_111600.h +++ b/src/include/game/game_111600.h @@ -37,7 +37,7 @@ struct textoverride *objGetTextOverride(struct defaultobj *obj); struct textoverride *weaponGetTextOverride(s32 weaponnum); s32 currentPlayerGetWeaponNumByInvIndex(s32 index); u16 currentPlayerGetInvNameIdByIndex(s32 index); -char *func0f112dfc(s32 index); +char *currentPlayerGetInvNameByIndex(s32 index); u32 func0f112e24(void); u32 func0f112f38(void); u32 func0f112f50(void);