mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-07-28 15:17:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decompile func0f0a1a10

Browse Source
This commit is contained in:
Ryan Dwyer
2020-11-02 21:56:36 +10:00
parent 59d9e09bd6
commit f81f4ba8f6
3 changed files with 13 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/game_097ba0.c
+10 -29
View File
@@ -12140,34 +12140,15 @@ s32 getCurrentPlayerWeaponIdWrapper(s32 handnum)
return getCurrentPlayerWeaponId(handnum);
}
GLOBAL_ASM(
glabel func0f0a1a10
/* f0a1a10: 27bdffe8 */ addiu $sp,$sp,-24
/* f0a1a14: afbf0014 */ sw $ra,0x14($sp)
/* f0a1a18: afa40018 */ sw $a0,0x18($sp)
/* f0a1a1c: 0fc2c5f0 */ jal weaponHasFlag
/* f0a1a20: 24050400 */ addiu $a1,$zero,0x400
/* f0a1a24: 1040000b */ beqz $v0,.L0f0a1a54
/* f0a1a28: 8fa40018 */ lw $a0,0x18($sp)
/* f0a1a2c: 0fc2a685 */ jal weaponGetAmmoType
/* f0a1a30: 00002825 */ or $a1,$zero,$zero
/* f0a1a34: 10400005 */ beqz $v0,.L0f0a1a4c
/* f0a1a38: 8fa40018 */ lw $a0,0x18($sp)
/* f0a1a3c: 0fc2a69d */ jal currentPlayerGetAmmoQuantityForWeapon
/* f0a1a40: 00002825 */ or $a1,$zero,$zero
/* f0a1a44: 58400004 */ blezl $v0,.L0f0a1a58
/* f0a1a48: 00001025 */ or $v0,$zero,$zero
.L0f0a1a4c:
/* f0a1a4c: 10000002 */ b .L0f0a1a58
/* f0a1a50: 24020001 */ addiu $v0,$zero,0x1
.L0f0a1a54:
/* f0a1a54: 00001025 */ or $v0,$zero,$zero
.L0f0a1a58:
/* f0a1a58: 8fbf0014 */ lw $ra,0x14($sp)
/* f0a1a5c: 27bd0018 */ addiu $sp,$sp,0x18
/* f0a1a60: 03e00008 */ jr $ra
/* f0a1a64: 00000000 */ nop
);
bool func0f0a1a10(s32 weaponnum)
{
if (weaponHasFlag(weaponnum, WEAPONFLAG_00000400)
&& (weaponGetAmmoType(weaponnum, FUNC_PRIMARY) == 0 || currentPlayerGetAmmoQuantityForWeapon(weaponnum, FUNC_PRIMARY) > 0)) {
return true;
}
return false;
}
GLOBAL_ASM(
glabel func0f0a1a68
@@ -21294,7 +21275,7 @@ u32 weaponGetAmmoType(u32 weaponnum, u32 func)
return weapon->ammos[func]->type;
}
u32 currentPlayerGetAmmoQuantityForWeapon(u32 weaponnum, u32 func)
s32 currentPlayerGetAmmoQuantityForWeapon(u32 weaponnum, u32 func)
{
struct weapon *weapon = weaponFindById(weaponnum);
src/include/constants.h
+1
View File
@@ -3019,6 +3019,7 @@
#define WEAPONFLAG_ONEHANDED 0x00000008 // Makes guards carry the gun with one hand
#define WEAPONFLAG_00000010 0x00000010
#define WEAPONFLAG_00000400 0x00000400
#define WEAPONFLAG_TRACKTIMEUSED 0x00000200 // Allow tracking how long gun is used, for weapon of choice
#define WEAPONFLAG_DUALWIELD 0x00001000 // Allow dual wielding
#define WEAPONFLAG_HIDEMENUMODEL 0x00040000 // Don't display the rotating model in the inventory menu
src/include/game/game_097ba0.h
+2 -2
View File
@@ -90,7 +90,7 @@ u32 func0f0a134c(void);
u32 func0f0a1528(void);
void currentPlayerEquipWeapon(s32 weaponnum);
s32 getCurrentPlayerWeaponId(s32 handnum);
u32 func0f0a1a10(void);
bool func0f0a1a10(s32 weaponnum);
u32 func0f0a1a68(void);
u32 func0f0a1ab0(void);
void func0f0a1b50(void);
@@ -158,7 +158,7 @@ s32 ammotypeGetMaxCapacity(u32 ammotype);
bool ammotypeAllowsUnlimitedAmmo(u32 ammotype);
void currentPlayerGiveUnlimitedAmmo(bool force);
u32 weaponGetAmmoType(u32 weaponnum, u32 func);
u32 currentPlayerGetAmmoQuantityForWeapon(u32 weaponnum, u32 func);
s32 currentPlayerGetAmmoQuantityForWeapon(u32 weaponnum, u32 func);
void currentPlayerGiveAmmoForWeapon(u32 weaponnum, u32 func, u32 quantity);
u32 func0f0a9b10(void);
u32 func0f0a9b68(void);