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

Decompile sightHasTargetWhileAiming

This commit is contained in:
Ryan Dwyer 2021-01-23 21:05:45 +10:00
parent a1a324c412
commit 97fde54de6
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/game/game_0d7070.c
View File

@ -6155,19 +6155,14 @@ glabel sightRenderTarget
/* f0dca24: 00000000 */ nop
);
GLOBAL_ASM(
glabel func0f0dca28
/* f0dca28: 10800003 */ beqz $a0,.L0f0dca38
/* f0dca2c: 24010005 */ addiu $at,$zero,0x5
/* f0dca30: 14810003 */ bne $a0,$at,.L0f0dca40
/* f0dca34: 00001025 */ or $v0,$zero,$zero
.L0f0dca38:
/* f0dca38: 03e00008 */ jr $ra
/* f0dca3c: 24020001 */ addiu $v0,$zero,0x1
.L0f0dca40:
/* f0dca40: 03e00008 */ jr $ra
/* f0dca44: 00000000 */ nop
);
bool sightHasTargetWhileAiming(s32 sight)
{
if (sight == SIGHT_DEFAULT || sight == SIGHT_ZOOM) {
return true;
}
return false;
}
Gfx *sightRender(Gfx *gdl, bool arg1, s32 sight)
{
@ -6224,7 +6219,7 @@ Gfx *sightRender(Gfx *gdl, bool arg1, s32 sight)
if (sight != SIGHT_NONE && optionsGetSightOnScreen(g_Vars.currentplayerstats->mpindex)) {
if ((optionsGetAlwaysShowTarget(g_Vars.currentplayerstats->mpindex) && !arg1)
|| (arg1 && func0f0dca28(sight))) {
|| (arg1 && sightHasTargetWhileAiming(sight))) {
gdl = sightRenderTarget(gdl);
}
}

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

@ -21,7 +21,7 @@ Gfx *sightRenderSkedar(Gfx *gdl, bool arg1);
Gfx *sightRenderZoom(Gfx *gdl, bool arg1);
Gfx *sightRenderMaian(Gfx *gdl, bool arg1);
Gfx *sightRenderTarget(Gfx *gdl);
bool func0f0dca28(s32 sight);
bool sightHasTargetWhileAiming(s32 sight);
Gfx *sightRender(Gfx *gdl, bool arg1, s32 sight);
#endif