diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index 4dc5be155..62ebd5d5f 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -46412,23 +46412,10 @@ glabel func0f046648 /* f046a2c: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel func0f046a30 -/* f046a30: 80830007 */ lb $v1,0x7($a0) -/* f046a34: 3862000f */ xori $v0,$v1,0xf -/* f046a38: 10400004 */ beqz $v0,.L0f046a4c -/* f046a3c: 3862000e */ xori $v0,$v1,0xe -/* f046a40: 2c420001 */ sltiu $v0,$v0,0x1 -/* f046a44: 10400004 */ beqz $v0,.L0f046a58 -/* f046a48: 00000000 */ sll $zero,$zero,0x0 -.L0f046a4c: -/* f046a4c: 9082032c */ lbu $v0,0x32c($a0) -/* f046a50: 0002702a */ slt $t6,$zero,$v0 -/* f046a54: 01c01025 */ or $v0,$t6,$zero -.L0f046a58: -/* f046a58: 03e00008 */ jr $ra -/* f046a5c: 00000000 */ sll $zero,$zero,0x0 -); +s32 func0f046a30(struct chrdata *chr) +{ + return (chr->actiontype == ACT_GOPOS || chr->actiontype == ACT_PATROL) && chr->unk32c_00 > 0; +} GLOBAL_ASM( glabel func0f046a60 diff --git a/src/include/game/chr/chr.h b/src/include/game/chr/chr.h index c1373bb0e..925a113cd 100644 --- a/src/include/game/chr/chr.h +++ b/src/include/game/chr/chr.h @@ -339,7 +339,7 @@ u32 func0f045760(void); u32 func0f045a70(void); u32 func0f045b9c(void); u32 func0f046648(void); -u32 func0f046a30(struct chrdata *chr); +s32 func0f046a30(struct chrdata *chr); u32 func0f046a60(void); u32 func0f046a8c(void); u32 func0f0473cc(void);