From 6c625efced9b12a2a52ed9e1d9db03bbc6547acb Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 19 Dec 2019 17:58:53 +1000 Subject: [PATCH] Identify chrTryAttackRun --- src/game/chr/chr.c | 2 +- src/game/chr/chraicommands.c | 2 +- src/include/game/chr/chr.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index f1449404e..81e76a4ea 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -32407,7 +32407,7 @@ glabel chrTryAttackWalk ); GLOBAL_ASM( -glabel func0f03a124 +glabel chrTryAttackRun /* f03a124: 27bdffd8 */ addiu $sp,$sp,-40 /* f03a128: afb00018 */ sw $s0,0x18($sp) /* f03a12c: 00808025 */ or $s0,$a0,$zero diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index f3f442f62..b656fa25d 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -826,7 +826,7 @@ bool aiWalkAndFire(void) */ bool aiRunAndFire(void) { - if (func0f03a124(g_Vars.chrdata)) { + if (chrTryAttackRun(g_Vars.chrdata)) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { diff --git a/src/include/game/chr/chr.h b/src/include/game/chr/chr.h index 1bd38dc85..a2208e3df 100644 --- a/src/include/game/chr/chr.h +++ b/src/include/game/chr/chr.h @@ -239,7 +239,7 @@ u32 chrTrySidestep(struct chrdata *chr); u32 chrTryJumpOut(struct chrdata *chr); u32 func0f039e28(struct chrdata *chr); u32 chrTryAttackWalk(struct chrdata *chr); -u32 func0f03a124(struct chrdata *chr); +u32 chrTryAttackRun(struct chrdata *chr); u32 func0f03a27c(struct chrdata *chr); u32 func0f03a3ec(struct chrdata *chr, u32 arg1, u32 arg2, u32 arg3, u32 arg4); u32 func0f03a578(struct chrdata *chr, u32 thingtype, u32 thingid);