diff --git a/src/game/game_097a50.c b/src/game/game_097a50.c index 2de91a74b..11ec68d66 100644 --- a/src/game/game_097a50.c +++ b/src/game/game_097a50.c @@ -22508,7 +22508,7 @@ glabel func0f0aa86c /* f0aad30: 93040000 */ lbu $a0,0x0($t8) /* f0aad34: 0fc2c401 */ jal weaponGetFunctionById /* f0aad38: afaa0058 */ sw $t2,0x58($sp) -/* f0aad3c: 0fc44bd4 */ jal func0f112f50 +/* f0aad3c: 0fc44bd4 */ jal currentPlayerGetEquipCurItem /* f0aad40: afa200bc */ sw $v0,0xbc($sp) /* f0aad44: 0fc44b3e */ jal currentPlayerGetInvNameIdByIndex /* f0aad48: 00402025 */ or $a0,$v0,$zero diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index ea4221e6b..ba8f11f66 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -15729,7 +15729,7 @@ glabel func0f0fe280 /* f0fe2fc: 00000000 */ sll $zero,$zero,0x0 /* f0fe300: 24e7ffff */ addiu $a3,$a3,-1 .L0f0fe304: -/* f0fe304: 0fc44bd4 */ jal func0f112f50 +/* f0fe304: 0fc44bd4 */ jal currentPlayerGetEquipCurItem /* f0fe308: afa70030 */ sw $a3,0x30($sp) /* f0fe30c: 3c18800a */ lui $t8,0x800a /* f0fe310: 8f1821b8 */ lw $t8,0x21b8($t8) diff --git a/src/game/game_102240.c b/src/game/game_102240.c index bb8f931c2..7d3c62fd4 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -4134,7 +4134,7 @@ glabel menuhandler00106178 /* f1062a4: 8dae0000 */ lw $t6,0x0($t5) /* f1062a8: 10000035 */ beqz $zero,.L0f106380 /* f1062ac: ac2e11f0 */ sw $t6,0x11f0($at) -/* f1062b0: 0fc44bd4 */ jal func0f112f50 +/* f1062b0: 0fc44bd4 */ jal currentPlayerGetEquipCurItem /* f1062b4: 00000000 */ sll $zero,$zero,0x0 /* f1062b8: 8faf0028 */ lw $t7,0x28($sp) /* f1062bc: 10000030 */ beqz $zero,.L0f106380 diff --git a/src/game/game_111600.c b/src/game/game_111600.c index 9f8e98909..d6295bfb8 100644 --- a/src/game/game_111600.c +++ b/src/game/game_111600.c @@ -1478,13 +1478,10 @@ void textoverrideInsert(struct textoverride *override) g_Vars.textoverrides = override; } -GLOBAL_ASM( -glabel func0f112f50 -/* f112f50: 3c0e800a */ lui $t6,0x800a -/* f112f54: 8dcea244 */ lw $t6,-0x5dbc($t6) -/* f112f58: 03e00008 */ jr $ra -/* f112f5c: 8dc21874 */ lw $v0,0x1874($t6) -); +u32 currentPlayerGetEquipCurItem(void) +{ + return g_Vars.currentplayer->equipcuritem; +} GLOBAL_ASM( glabel func0f112f60 diff --git a/src/include/game/game_111600.h b/src/include/game/game_111600.h index 3d6f8e857..88a2c18f3 100644 --- a/src/include/game/game_111600.h +++ b/src/include/game/game_111600.h @@ -40,7 +40,7 @@ u16 currentPlayerGetInvNameIdByIndex(s32 index); char *currentPlayerGetInvNameByIndex(s32 index); u32 func0f112e24(void); void textoverrideInsert(struct textoverride *override); -u32 func0f112f50(void); +u32 currentPlayerGetEquipCurItem(void); u32 func0f112f60(void); void func0f112f70(void); u32 func0f112fec(void);