diff --git a/src/game/game_190260.c b/src/game/game_190260.c
index b2dd491ab..8af70b65d 100644
--- a/src/game/game_190260.c
+++ b/src/game/game_190260.c
@@ -3609,7 +3609,7 @@ glabel func0f19369c
 /*  f193710:	afa8001c */ 	sw	$t0,0x1c($sp)
 /*  f193714:	afa70028 */ 	sw	$a3,0x28($sp)
 /*  f193718:	00055880 */ 	sll	$t3,$a1,0x2
-/*  f19371c:	0fc6667e */ 	jal	func0f1999f8
+/*  f19371c:	0fc6667e */ 	jal	weaponGetClipSizeByFunction
 /*  f193720:	000b2fc2 */ 	srl	$a1,$t3,0x1f
 /*  f193724:	8fa70028 */ 	lw	$a3,0x28($sp)
 /*  f193728:	8faf002c */ 	lw	$t7,0x2c($sp)
@@ -5052,7 +5052,7 @@ glabel var7f1b8fc8
 /*  f194c70:	00054880 */ 	sll	$t1,$a1,0x2
 /*  f194c74:	00092fc2 */ 	srl	$a1,$t1,0x1f
 /*  f194c78:	afa70054 */ 	sw	$a3,0x54($sp)
-/*  f194c7c:	0fc6667e */ 	jal	func0f1999f8
+/*  f194c7c:	0fc6667e */ 	jal	weaponGetClipSizeByFunction
 /*  f194c80:	afa302e8 */ 	sw	$v1,0x2e8($sp)
 /*  f194c84:	8fa302e8 */ 	lw	$v1,0x2e8($sp)
 /*  f194c88:	8fa70054 */ 	lw	$a3,0x54($sp)
diff --git a/src/game/game_1999b0.c b/src/game/game_1999b0.c
index 7378f950a..acaf4608e 100644
--- a/src/game/game_1999b0.c
+++ b/src/game/game_1999b0.c
@@ -38,29 +38,18 @@ s32 weaponGetAmmoTypeByFunction(s32 weaponnum, u32 funcnum)
 	return 0;
 }
 
-GLOBAL_ASM(
-glabel func0f1999f8
-/*  f1999f8:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f1999fc:	28810002 */ 	slti	$at,$a0,0x2
-/*  f199a00:	1420000a */ 	bnez	$at,.L0f199a2c
-/*  f199a04:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f199a08:	2881005e */ 	slti	$at,$a0,0x5e
-/*  f199a0c:	50200008 */ 	beqzl	$at,.L0f199a30
-/*  f199a10:	00001025 */ 	or	$v0,$zero,$zero
-/*  f199a14:	0fc2c47b */ 	jal	weaponGetAmmoByFunction
-/*  f199a18:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f199a1c:	50400004 */ 	beqzl	$v0,.L0f199a30
-/*  f199a20:	00001025 */ 	or	$v0,$zero,$zero
-/*  f199a24:	10000002 */ 	beqz	$zero,.L0f199a30
-/*  f199a28:	84420008 */ 	lh	$v0,0x8($v0)
-.L0f199a2c:
-/*  f199a2c:	00001025 */ 	or	$v0,$zero,$zero
-.L0f199a30:
-/*  f199a30:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f199a34:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f199a38:	03e00008 */ 	jr	$ra
-/*  f199a3c:	00000000 */ 	sll	$zero,$zero,0x0
-);
+s32 weaponGetClipSizeByFunction(s32 weaponnum, u32 funcnum)
+{
+	if (weaponnum >= WEAPON_FALCON2 && weaponnum <= WEAPON_SUICIDEPILL) {
+		struct inventory_ammo *ammo = weaponGetAmmoByFunction(weaponnum, funcnum);
+
+		if (ammo) {
+			return ammo->clipsize;
+		}
+	}
+
+	return 0;
+}
 
 GLOBAL_ASM(
 glabel func0f199a40
@@ -94,7 +83,7 @@ glabel func0f199a40
 /*  f199aac:	8e040020 */ 	lw	$a0,0x20($s0)
 /*  f199ab0:	afa30054 */ 	sw	$v1,0x54($sp)
 /*  f199ab4:	00055880 */ 	sll	$t3,$a1,0x2
-/*  f199ab8:	0fc6667e */ 	jal	func0f1999f8
+/*  f199ab8:	0fc6667e */ 	jal	weaponGetClipSizeByFunction
 /*  f199abc:	000b2fc2 */ 	srl	$a1,$t3,0x1f
 /*  f199ac0:	18400043 */ 	blez	$v0,.L0f199bd0
 /*  f199ac4:	8fa30054 */ 	lw	$v1,0x54($sp)
diff --git a/src/include/game/game_1999b0.h b/src/include/game/game_1999b0.h
index e532fdfb5..71c754332 100644
--- a/src/include/game/game_1999b0.h
+++ b/src/include/game/game_1999b0.h
@@ -4,7 +4,7 @@
 #include "types.h"
 
 s32 weaponGetAmmoTypeByFunction(s32 weaponnum, u32 funcnum);
-u32 func0f1999f8(void);
+s32 weaponGetClipSizeByFunction(s32 weaponnum, u32 funcnum);
 u32 func0f199a40(void);
 s32 func0f199be4(struct aibot *aibot, u32 weaponnum, u32 arg2, u32 arg3);
 u32 func0f199cb8(void);
diff --git a/src/include/types.h b/src/include/types.h
index 9a0686761..18b014d82 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -2705,7 +2705,7 @@ struct weaponfunc_visual {
 struct inventory_ammo {
 	u32 type;
 	u32 casingeject;
-	u16 clipsize;
+	s16 clipsize;
 	u32 *reload_animation;
 	u32 style;
 };