diff --git a/src/game/game_111600.c b/src/game/game_111600.c index bf82e9f4a..5f0b5533c 100644 --- a/src/game/game_111600.c +++ b/src/game/game_111600.c @@ -298,18 +298,10 @@ glabel func0f1119d0 /* f111a24: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel func0f111a28 -/* f111a28: 27bdffe8 */ addiu $sp,$sp,-24 -/* f111a2c: afbf0014 */ sw $ra,0x14($sp) -/* f111a30: 0fc44674 */ jal func0f1119d0 -/* f111a34: 00000000 */ sll $zero,$zero,0x0 -/* f111a38: 8fbf0014 */ lw $ra,0x14($sp) -/* f111a3c: 0002702b */ sltu $t6,$zero,$v0 -/* f111a40: 01c01025 */ or $v0,$t6,$zero -/* f111a44: 03e00008 */ jr $ra -/* f111a48: 27bd0018 */ addiu $sp,$sp,0x18 -); +bool func0f111a28(s32 weaponnum) +{ + return func0f1119d0(weaponnum) != NULL; +} GLOBAL_ASM( glabel func0f111a4c diff --git a/src/include/game/game_111600.h b/src/include/game/game_111600.h index ea789d8fd..83f982fa5 100644 --- a/src/include/game/game_111600.h +++ b/src/include/game/game_111600.h @@ -9,7 +9,7 @@ void func0f11179c(struct invitem *item); u32 func0f1118cc(void); struct invitem *currentPlayerGetUnusedInvItem(void); void currentPlayerSetAllGuns(bool enable); -u32 func0f1119d0(void); +void *func0f1119d0(s32 weaponnum); bool func0f111a28(s32 weaponnum); u32 func0f111a4c(void); bool func0f111ab0(s32 weapon1, s32 weapon2);