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

Decompile func0f039558

This commit is contained in:
Ryan Dwyer 2020-02-11 08:02:17 +10:00
parent e281dabb76
commit 26fc615ffb
3 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/game/game_02cde0.c
View File

@ -14001,30 +14001,16 @@ glabel func0f039474
/* f039554: 00000000 */ sll $zero,$zero,0x0
);
GLOBAL_ASM(
glabel func0f039558
/* f039558: 27bdffe0 */ addiu $sp,$sp,-32
/* f03955c: afa40020 */ sw $a0,0x20($sp)
/* f039560: afbf0014 */ sw $ra,0x14($sp)
/* f039564: afa50024 */ sw $a1,0x24($sp)
/* f039568: 00a02025 */ or $a0,$a1,$zero
/* f03956c: 0fc1905e */ jal func0f064178
/* f039570: 00002825 */ or $a1,$zero,$zero
/* f039574: 8fa20024 */ lw $v0,0x24($sp)
/* f039578: 8fa40020 */ lw $a0,0x20($sp)
/* f03957c: 24450008 */ addiu $a1,$v0,0x8
/* f039580: 0fc0e51d */ jal func0f039474
/* f039584: 24460028 */ addiu $a2,$v0,0x28
/* f039588: afa2001c */ sw $v0,0x1c($sp)
/* f03958c: 8fa40024 */ lw $a0,0x24($sp)
/* f039590: 0fc1905e */ jal func0f064178
/* f039594: 24050001 */ addiu $a1,$zero,0x1
/* f039598: 8fbf0014 */ lw $ra,0x14($sp)
/* f03959c: 8fa2001c */ lw $v0,0x1c($sp)
/* f0395a0: 27bd0020 */ addiu $sp,$sp,0x20
/* f0395a4: 03e00008 */ jr $ra
/* f0395a8: 00000000 */ sll $zero,$zero,0x0
);
bool func0f039558(struct chrdata *chr, struct prop *prop)
{
bool result;
func0f064178(prop, false);
result = func0f039474(chr, &prop->pos, &prop->rooms[0]);
func0f064178(prop, true);
return result;
}
void chrRecordLastSeeTargetTime(struct chrdata *chr)
{
@ -35293,4 +35279,4 @@ void chrEmitSparks(struct chrdata *chr)
func0f0939f8(0, chr->prop, 100, -1, -1, 0, 0, 0, 0, -1, 0, -1, -1, -1, -1);
func0f12f9f0(chr->prop->rooms[0], chr->prop, &chr->prop->pos, 0, 0, 1);
}
}
}

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

@ -95,7 +95,7 @@ u32 func0f038f40(void);
u32 func0f0391ec(struct chrdata *chr, struct coord *pos, s16 *room, u32 arg3);
u32 func0f03922c(struct chrdata *chr, void *arg1, s32 arg2);
u32 func0f0393b4(struct chrdata *chr, struct coord *pos, s16 *room);
u32 func0f039474(void);
bool func0f039474(struct chrdata *chr, struct coord *pos, s16 *room);
bool func0f039558(struct chrdata *chr, struct prop *prop);
bool chrIsStopped(struct chrdata *chr);
u32 func0f03978c(struct chrdata *chr);

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

@ -32,7 +32,7 @@ u32 func0f062ef8(void);
u32 func0f062fac(void);
u32 func0f06302c(void);
u32 func0f063dcc(void);
u32 func0f064178(void);
void func0f064178(struct prop *prop, bool arg1);
u32 func0f0641f4(void);
u32 func0f06438c(void);
u32 func0f064a24(void);