diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index 931960b50..11b2a1ecc 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -21658,16 +21658,10 @@ glabel currentPlayerGetAmmoCount /* f0a98f0: 00601025 */ or $v0,$v1,$zero ); -GLOBAL_ASM( -glabel ammotypeGetMaxCapacity -/* f0a98f4: 00047080 */ sll $t6,$a0,0x2 -/* f0a98f8: 01c47023 */ subu $t6,$t6,$a0 -/* f0a98fc: 000e7080 */ sll $t6,$t6,0x2 -/* f0a9900: 3c028007 */ lui $v0,%hi(g_AmmoTypes) -/* f0a9904: 004e1021 */ addu $v0,$v0,$t6 -/* f0a9908: 03e00008 */ jr $ra -/* f0a990c: 8c420368 */ lw $v0,%lo(g_AmmoTypes)($v0) -); +u32 ammotypeGetMaxCapacity(u32 ammotype) +{ + return g_AmmoTypes[ammotype].capacity; +} bool ammotypeAllowsUnlimitedAmmo(u32 ammotype) { diff --git a/src/include/game/game_097ba0.h b/src/include/game/game_097ba0.h index 54a526cff..bdbd09cd5 100644 --- a/src/include/game/game_097ba0.h +++ b/src/include/game/game_097ba0.h @@ -154,7 +154,7 @@ void func0f0a95ec(u32 arg0, u32 arg1); void currentPlayerGiveAmmo(s32 ammotype, s32 quantity); s32 ammoGetQuantity(u32 type); s32 currentPlayerGetAmmoCount(s8 arg0); -s32 ammotypeGetMaxCapacity(u32 ammotype); +u32 ammotypeGetMaxCapacity(u32 ammotype); bool ammotypeAllowsUnlimitedAmmo(u32 ammotype); void currentPlayerGiveUnlimitedAmmo(bool force); u32 weaponGetAmmoType(u32 weaponnum, u32 func);