falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Decompile func0f111ab0

This commit is contained in:
Ryan Dwyer 2020-02-05 23:12:46 +10:00
parent 8c6916d27a
commit 6f25277cc7
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/game/game_111600.c
View File

@ -336,18 +336,10 @@ glabel func0f111a4c
/* f111aac: 00000000 */ sll $zero,$zero,0x0
);
GLOBAL_ASM(
glabel func0f111ab0
/* f111ab0: 27bdffe8 */ addiu $sp,$sp,-24
/* f111ab4: afbf0014 */ sw $ra,0x14($sp)
/* f111ab8: 0fc44693 */ jal func0f111a4c
/* f111abc: 00000000 */ sll $zero,$zero,0x0
/* f111ac0: 8fbf0014 */ lw $ra,0x14($sp)
/* f111ac4: 0002702b */ sltu $t6,$zero,$v0
/* f111ac8: 01c01025 */ or $v0,$t6,$zero
/* f111acc: 03e00008 */ jr $ra
/* f111ad0: 27bd0018 */ addiu $sp,$sp,0x18
);
bool func0f111ab0(s32 weapon1, s32 weapon2)
{
return func0f111a4c(weapon1, weapon2) != NULL;
}
GLOBAL_ASM(
glabel func0f111ad4

2
src/include/game/game_111600.h
View File

@ -11,7 +11,7 @@ struct invitem *currentPlayerGetUnusedInvItem(void);
void currentPlayerSetAllGuns(bool enable);
void *func0f1119d0(s32 weaponnum);
bool func0f111a28(s32 weaponnum);
u32 func0f111a4c(void);
void *func0f111a4c(s32 weapon1, s32 weapon2);
bool func0f111ab0(s32 weapon1, s32 weapon2);
u32 func0f111ad4(void);
u32 func0f111b88(void);