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

Decompile func0f0ce450

This commit is contained in:
Ryan Dwyer 2020-03-01 23:54:55 +10:00
parent 0f5fdb179a
commit 1b3b0454b1
3 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/game/bondgrab.c
View File

@ -2101,31 +2101,15 @@ glabel func0f0ce1ac
/* f0ce44c: 00000000 */ sll $zero,$zero,0x0
);
GLOBAL_ASM(
glabel func0f0ce450
/* f0ce450: 3c0e800a */ lui $t6,0x800a
/* f0ce454: 8dcea244 */ lw $t6,-0x5dbc($t6)
/* f0ce458: 27bdffe8 */ addiu $sp,$sp,-24
/* f0ce45c: afbf0014 */ sw $ra,0x14($sp)
/* f0ce460: 0fc21b58 */ jal func0f086d60
/* f0ce464: 8dc41b5c */ lw $a0,0x1b5c($t6)
/* f0ce468: 3c03800a */ lui $v1,%hi(g_Vars)
/* f0ce46c: 10400004 */ beqz $v0,.L0f0ce480
/* f0ce470: 24639fc0 */ addiu $v1,$v1,%lo(g_Vars)
/* f0ce474: 8c6f0284 */ lw $t7,0x284($v1)
/* f0ce478: 10000005 */ beqz $zero,.L0f0ce490
/* f0ce47c: ade000d0 */ sw $zero,0xd0($t7)
.L0f0ce480:
/* f0ce480: 8c780284 */ lw $t8,0x284($v1)
/* f0ce484: 00002025 */ or $a0,$zero,$zero
/* f0ce488: 0fc31f4c */ jal currentPlayerSetMoveMode
/* f0ce48c: af0000d0 */ sw $zero,0xd0($t8)
.L0f0ce490:
/* f0ce490: 8fbf0014 */ lw $ra,0x14($sp)
/* f0ce494: 27bd0018 */ addiu $sp,$sp,0x18
/* f0ce498: 03e00008 */ jr $ra
/* f0ce49c: 00000000 */ sll $zero,$zero,0x0
);
void func0f0ce450(void)
{
if (func0f086d60(g_Vars.currentplayer->grabbedprop)) {
g_Vars.currentplayer->unk00d0 = 0;
} else {
g_Vars.currentplayer->unk00d0 = 0;
currentPlayerSetMoveMode(MOVEMODE_WALK);
}
}
GLOBAL_ASM(
glabel func0f0ce4a0

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

@ -18,7 +18,7 @@ u32 func0f0ce0bc(void);
void currentPlayerUpdatePrevPosGrab(void);
void func0f0ce178(void);
u32 func0f0ce1ac(void);
u32 func0f0ce450(void);
void func0f0ce450(void);
u32 func0f0ce4a0(void);
u32 func0f0ce55c(void);
u32 func0f0ce608(void);

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

@ -228,7 +228,7 @@ u32 func0f085eac(void);
u32 func0f086918(void);
u32 objIsHealthy(struct defaultobj *obj);
u32 func0f0869cc(void);
u32 func0f086d60(void);
bool func0f086d60(struct prop *prop);
void func0f086f40(struct prop *prop);
void propObjSetOrUnsetHiddenFlag00400000(struct prop *prop, bool enable);
u32 func0f087458(void);