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

Decompile func0f03ab74

This commit is contained in:
Ryan Dwyer 2019-12-18 17:34:15 +10:00
parent da4d81bf93
commit 2aefa34ec6
2 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/game/chr/chr.c
View File

@ -33320,34 +33320,16 @@ bool chrGoToChr(struct chrdata *chr, u32 dst_chrnum, u32 speed)
return false;
}
GLOBAL_ASM(
glabel func0f03ab74
/* f03ab74: 27bdffe8 */ addiu $sp,$sp,-24
/* f03ab78: afbf0014 */ sw $ra,0x14($sp)
/* f03ab7c: afa40018 */ sw $a0,0x18($sp)
/* f03ab80: afa5001c */ sw $a1,0x1c($sp)
/* f03ab84: 0fc0e686 */ jal func0f039a18
/* f03ab88: afa60020 */ sw $a2,0x20($sp)
/* f03ab8c: 1040000b */ beqz $v0,.L0f03abbc
/* f03ab90: 8fa3001c */ lw $v1,0x1c($sp)
/* f03ab94: 10600009 */ beqz $v1,.L0f03abbc
/* f03ab98: 8fa40018 */ lw $a0,0x18($sp)
/* f03ab9c: 24650008 */ addiu $a1,$v1,0x8
/* f03aba0: 24660028 */ addiu $a2,$v1,0x28
/* f03aba4: 0fc0e10f */ jal func0f03843c
/* f03aba8: 8fa70020 */ lw $a3,0x20($sp)
/* f03abac: 50400004 */ beqzl $v0,.L0f03abc0
/* f03abb0: 00001025 */ or $v0,$zero,$zero
/* f03abb4: 10000002 */ beqz $zero,.L0f03abc0
/* f03abb8: 24020001 */ addiu $v0,$zero,0x1
.L0f03abbc:
/* f03abbc: 00001025 */ or $v0,$zero,$zero
.L0f03abc0:
/* f03abc0: 8fbf0014 */ lw $ra,0x14($sp)
/* f03abc4: 27bd0018 */ addiu $sp,$sp,0x18
/* f03abc8: 03e00008 */ jr $ra
/* f03abcc: 00000000 */ sll $zero,$zero,0x0
);
bool func0f03ab74(struct chrdata *chr, struct position *pos, s32 arg2)
{
if (func0f039a18(chr) && pos) {
if (func0f03843c(chr, &pos->coord, &pos->room, arg2)) {
return true;
}
}
return false;
}
GLOBAL_ASM(
glabel func0f03abd0

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

@ -253,7 +253,7 @@ u32 func0f03a9b8(struct chrdata *chr);
u32 func0f03aa0c(struct chrdata *chr);
u32 func0f03aa38(struct chrdata *chr, u32 arg1);
bool chrGoToChr(struct chrdata *chr, u32 dst_chrnum, u32 speed);
void func0f03ab74(struct chrdata *chr, struct position *pos, s32 arg2);
bool func0f03ab74(struct chrdata *chr, struct position *pos, s32 arg2);
u32 func0f03abd0(void);
u32 func0f03aca0(struct chrdata *chr, u32 arg1, u32 arg2);
bool func0f03ad8c(struct chrdata *chr);