diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index c1176fa41..69e664985 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -2118,7 +2118,7 @@ bool aiIfDistanceToTargetGreaterThan(void) * @cmd 0054 */ GLOBAL_ASM( -glabel ai0054 +glabel aiIfChrDistanceToPadLessThan /* f050b64: 27bdffd0 */ addiu $sp,$sp,-48 /* f050b68: afb00018 */ sw $s0,0x18($sp) /* f050b6c: 3c10800a */ lui $s0,0x800a diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index 03170411b..2fe9b8898 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -87,7 +87,7 @@ /*0x0051*/ bool ai0051(void); /*0x0052*/ bool aiIfDistanceToTargetLessThan(void); /*0x0053*/ bool aiIfDistanceToTargetGreaterThan(void); -/*0x0054*/ bool ai0054(void); +/*0x0054*/ bool aiIfChrDistanceToPadLessThan(void); /*0x0055*/ bool ai0055(void); /*0x0056*/ bool ai0056(void); /*0x0057*/ bool ai0057(void); diff --git a/src/include/game/game_000000.h b/src/include/game/game_000000.h index 3579a7226..970c80f5f 100644 --- a/src/include/game/game_000000.h +++ b/src/include/game/game_000000.h @@ -35,6 +35,7 @@ u32 func0f01b148(void); u32 func0f01b154(void); void func0f03af44(struct chrdata *chr, u32 anim_id, float fstartframe, float fendframe, u8 flags, u8 transition, float result); u32 func0f048f20(struct chrdata *chr, u8 b); +float chrGetDistanceToPad(struct chrdata *chr, s32 pad_id); float chrGetDistanceToTarget(struct chrdata *chr); float positionGetDistanceToPosition(struct position *a, struct position *b); diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index e988e053f..98bc27f70 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -14037,7 +14037,7 @@ bool (*g_CommandPointers[])(void) = { /*0x0051*/ ai0051, /*0x0052*/ aiIfDistanceToTargetLessThan, /*0x0053*/ aiIfDistanceToTargetGreaterThan, - /*0x0054*/ ai0054, + /*0x0054*/ aiIfChrDistanceToPadLessThan, /*0x0055*/ ai0055, /*0x0056*/ ai0056, /*0x0057*/ ai0057,