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

Decompile propHide

This commit is contained in:
Ryan Dwyer 2019-12-29 18:25:23 +10:00
parent 3bbad9cae5
commit 46c705357e
12 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18092,7 +18092,7 @@ glabel func0f02d4fc
/* f02d744: 00402025 */ or $a0,$v0,$zero
/* f02d748: 0fc1812f */ jal func0f0604bc
/* f02d74c: afa20050 */ sw $v0,0x50($sp)
/* f02d750: 0fc180bc */ jal func0f0602f0
/* f02d750: 0fc180bc */ jal propHide
/* f02d754: 8fa40050 */ lw $a0,0x50($sp)
/* f02d758: 8fae0050 */ lw $t6,0x50($sp)
/* f02d75c: 86050008 */ lh $a1,0x8($s0)
@ -18454,7 +18454,7 @@ glabel func0f02dbac
/* f02dc70: 00402025 */ or $a0,$v0,$zero
/* f02dc74: 0fc1812f */ jal func0f0604bc
/* f02dc78: afa20078 */ sw $v0,0x78($sp)
/* f02dc7c: 0fc180bc */ jal func0f0602f0
/* f02dc7c: 0fc180bc */ jal propHide
/* f02dc80: 8fa40078 */ lw $a0,0x78($sp)
/* f02dc84: 8faa0078 */ lw $t2,0x78($sp)
/* f02dc88: 0fc0817b */ jal getLowestUnusedChrId
@ -50740,7 +50740,7 @@ glabel chrSpawnAtCoord
/* f04b3cc: 00402025 */ or $a0,$v0,$zero
/* f04b3d0: 0fc1814e */ jal func0f060538
/* f04b3d4: afa20074 */ sw $v0,0x74($sp)
/* f04b3d8: 0fc180bc */ jal func0f0602f0
/* f04b3d8: 0fc180bc */ jal propHide
/* f04b3dc: 8fa40074 */ lw $a0,0x74($sp)
/* f04b3e0: 8faf0074 */ lw $t7,0x74($sp)
/* f04b3e4: 8fb8007c */ lw $t8,0x7c($sp)

4
src/game/chr/chraicommands.c
View File

@ -7076,7 +7076,7 @@ bool aiShowChr(void)
if (chr && chr->prop && chr->unk020) {
func0f0604bc(chr->prop);
func0f0602f0(chr->prop);
propHide(chr->prop);
func0f0220ac(chr);
}
@ -7114,7 +7114,7 @@ bool aiShowObj(void)
if (obj && obj->prop && obj->unk18) {
func0f0604bc(obj->prop);
func0f0602f0(obj->prop);
propHide(obj->prop);
if (g_Vars.currentplayer->eyespy == NULL && obj->type == OBJTYPE_WEAPON) {
struct weaponobj *weapon = (struct weaponobj *) obj;

4
src/game/game_00c490.c
View File

@ -1470,7 +1470,7 @@ glabel func0f00cee4
/* f00d64c: 0fc1812f */ jal func0f0604bc
/* f00d650: 8fa4007c */ lw $a0,0x7c($sp)
.L0f00d654:
/* f00d654: 0fc180bc */ jal func0f0602f0
/* f00d654: 0fc180bc */ jal propHide
/* f00d658: 8fa4007c */ lw $a0,0x7c($sp)
.L0f00d65c:
/* f00d65c: 8fbf0034 */ lw $ra,0x34($sp)
@ -2755,7 +2755,7 @@ glabel func0f00e368
.L0f00e8dc:
/* f00e8dc: 0fc1812f */ jal func0f0604bc
/* f00e8e0: 8fa4010c */ lw $a0,0x10c($sp)
/* f00e8e4: 0fc180bc */ jal func0f0602f0
/* f00e8e4: 0fc180bc */ jal propHide
/* f00e8e8: 8fa4010c */ lw $a0,0x10c($sp)
/* f00e8ec: 10000003 */ beqz $zero,.L0f00e8fc
/* f00e8f0: 8fbf0034 */ lw $ra,0x34($sp)

2
src/game/game_011110.c
View File

@ -1084,7 +1084,7 @@ glabel func0f0118f4
/* f011fb8: 0fc1812f */ jal func0f0604bc
/* f011fbc: 8de400bc */ lw $a0,0xbc($t7)
/* f011fc0: 8e290284 */ lw $t1,0x284($s1)
/* f011fc4: 0fc180bc */ jal func0f0602f0
/* f011fc4: 0fc180bc */ jal propHide
/* f011fc8: 8d2400bc */ lw $a0,0xbc($t1)
/* f011fcc: 8e2a0284 */ lw $t2,0x284($s1)
/* f011fd0: 00002825 */ or $a1,$zero,$zero

2
src/game/game_013540.c
View File

@ -1471,7 +1471,7 @@ glabel func0f014848
/* f014928: 00402025 */ or $a0,$v0,$zero
/* f01492c: 0fc1812f */ jal func0f0604bc
/* f014930: afa20070 */ sw $v0,0x70($sp)
/* f014934: 0fc180bc */ jal func0f0602f0
/* f014934: 0fc180bc */ jal propHide
/* f014938: 8fa40070 */ lw $a0,0x70($sp)
/* f01493c: 8fb80070 */ lw $t8,0x70($sp)
/* f014940: 87a5007a */ lh $a1,0x7a($sp)

11
src/game/game_0601b0.c
View File

@ -283,13 +283,10 @@ glabel func0f0601b0
/* f0602ec: 27bd0348 */ addiu $sp,$sp,0x348
);
GLOBAL_ASM(
glabel func0f0602f0
/* f0602f0: 908e0001 */ lbu $t6,0x1($a0)
/* f0602f4: 35cf0004 */ ori $t7,$t6,0x4
/* f0602f8: 03e00008 */ jr $ra
/* f0602fc: a08f0001 */ sb $t7,0x1($a0)
);
void propHide(struct prop *prop)
{
prop->flags |= PROPFLAG_HIDDEN;
}
GLOBAL_ASM(
glabel func0f060300

4
src/game/game_066310.c
View File

@ -28497,7 +28497,7 @@ glabel func0f07e474
/* f07e5dc: 1000001c */ beqz $zero,.L0f07e650
/* f07e5e0: afad0060 */ sw $t5,0x60($sp)
.L0f07e5e4:
/* f07e5e4: 0fc180bc */ jal func0f0602f0
/* f07e5e4: 0fc180bc */ jal propHide
/* f07e5e8: 02202025 */ or $a0,$s1,$zero
/* f07e5ec: 0fc248f5 */ jal func0f0923d4
/* f07e5f0: 02002025 */ or $a0,$s0,$zero
@ -34522,7 +34522,7 @@ glabel func0f08307c
/* f083cb8: 8fa40140 */ lw $a0,0x140($sp)
/* f083cbc: 0fc1812f */ jal func0f0604bc
/* f083cc0: 8fa40140 */ lw $a0,0x140($sp)
/* f083cc4: 0fc180bc */ jal func0f0602f0
/* f083cc4: 0fc180bc */ jal propHide
/* f083cc8: 8fa40140 */ lw $a0,0x140($sp)
/* f083ccc: 8fa40140 */ lw $a0,0x140($sp)
/* f083cd0: c7b20120 */ lwc1 $f18,0x120($sp)

2
src/game/game_097a50.c
View File

@ -8923,7 +8923,7 @@ glabel func0f09ebcc
/* f09ebf4: 8fbf001c */ lw $ra,0x1c($sp)
/* f09ebf8: 0fc1812f */ jal func0f0604bc
/* f09ebfc: 02202025 */ or $a0,$s1,$zero
/* f09ec00: 0fc180bc */ jal func0f0602f0
/* f09ec00: 0fc180bc */ jal propHide
/* f09ec04: 02202025 */ or $a0,$s1,$zero
/* f09ec08: 8e0e0018 */ lw $t6,0x18($s0)
/* f09ec0c: 8fa50034 */ lw $a1,0x34($sp)

4
src/game/game_129900.c
View File

@ -1517,7 +1517,7 @@ glabel func0f129f54
/* f12a2c8: afaa0158 */ sw $t2,0x158($sp)
/* f12a2cc: 0fc1814e */ jal func0f060538
/* f12a2d0: 02a02025 */ or $a0,$s5,$zero
/* f12a2d4: 0fc180bc */ jal func0f0602f0
/* f12a2d4: 0fc180bc */ jal propHide
/* f12a2d8: 02a02025 */ or $a0,$s5,$zero
/* f12a2dc: 8faa0158 */ lw $t2,0x158($sp)
/* f12a2e0: 3c188008 */ lui $t8,0x8008
@ -5998,7 +5998,7 @@ glabel func0f12e1c0
/* f12e3fc: a5c60028 */ sh $a2,0x28($t6)
/* f12e400: 0fc1814e */ jal func0f060538
/* f12e404: 02202025 */ or $a0,$s1,$zero
/* f12e408: 0fc180bc */ jal func0f0602f0
/* f12e408: 0fc180bc */ jal propHide
/* f12e40c: 02202025 */ or $a0,$s1,$zero
/* f12e410: 8faf002c */ lw $t7,0x2c($sp)
/* f12e414: 00107040 */ sll $t6,$s0,0x1

2
src/game/game_176d70.c
View File

@ -18657,7 +18657,7 @@ glabel func0f186508
/* f186690: 0fc1812f */ jal func0f0604bc
/* f186694: 8da40014 */ lw $a0,0x14($t5)
/* f186698: 8fb90018 */ lw $t9,0x18($sp)
/* f18669c: 0fc180bc */ jal func0f0602f0
/* f18669c: 0fc180bc */ jal propHide
/* f1866a0: 8f240014 */ lw $a0,0x14($t9)
/* f1866a4: 8fb80018 */ lw $t8,0x18($sp)
/* f1866a8: 8fbf0014 */ lw $ra,0x14($sp)

2
src/include/constants.h
View File

@ -684,6 +684,8 @@
#define PATHTYPE_CIRCULAR 1
#define PATHTYPE_FLYING 2
#define PROPFLAG_HIDDEN 0x04
#define PROPTYPE_OBJ 1
#define PROPTYPE_DOOR 2
#define PROPTYPE_CHR 3

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

@ -4,7 +4,7 @@
#include "types.h"
u32 func0f0601b0(void);
u32 func0f0602f0(struct prop *prop);
void propHide(struct prop *prop);
u32 func0f060300(struct prop *prop);
struct prop *func0f060358(void);
u32 func0f060438(void);