diff --git a/src/game/game_000000.c b/src/game/game_000000.c index 022c0dc39..bfd33b375 100644 --- a/src/game/game_000000.c +++ b/src/game/game_000000.c @@ -83957,26 +83957,16 @@ float chrGetDistanceToCoord(struct chrdata *chr, struct coord *coord) return sqrtf(xdiff * xdiff + ydiff * ydiff + zdiff * zdiff); } +float chrGetLateralDistanceToCoord(struct chrdata *chr, struct coord *coord) +{ + float xdiff = coord->x - chr->pos->coord.x; + float zdiff = coord->z - chr->pos->coord.z; + + return sqrtf(xdiff * xdiff + zdiff * zdiff); +} + GLOBAL_ASM( -glabel func0f049490 -/* f049490: 27bdffe8 */ addiu $sp,$sp,-24 -/* f049494: afbf0014 */ sw $ra,0x14($sp) -/* f049498: 8c82001c */ lw $v0,0x1c($a0) -/* f04949c: c4a40000 */ lwc1 $f4,0x0($a1) -/* f0494a0: c4a80008 */ lwc1 $f8,0x8($a1) -/* f0494a4: c4460008 */ lwc1 $f6,0x8($v0) -/* f0494a8: c44a0010 */ lwc1 $f10,0x10($v0) -/* f0494ac: 46062001 */ sub.s $f0,$f4,$f6 -/* f0494b0: 460a4081 */ sub.s $f2,$f8,$f10 -/* f0494b4: 46000402 */ mul.s $f16,$f0,$f0 -/* f0494b8: 00000000 */ sll $zero,$zero,0x0 -/* f0494bc: 46021482 */ mul.s $f18,$f2,$f2 -/* f0494c0: 0c012974 */ jal sqrtf -/* f0494c4: 46128300 */ add.s $f12,$f16,$f18 -/* f0494c8: 8fbf0014 */ lw $ra,0x14($sp) -/* f0494cc: 27bd0018 */ addiu $sp,$sp,0x18 -/* f0494d0: 03e00008 */ jr $ra -/* f0494d4: 00000000 */ sll $zero,$zero,0x0 +glabel func0f0494d8 /* f0494d8: 27bdff80 */ addiu $sp,$sp,-128 /* f0494dc: afbf0014 */ sw $ra,0x14($sp) /* f0494e0: 8c8e001c */ lw $t6,0x1c($a0) diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c index 181289833..cc3f8c03d 100644 --- a/src/game/game_0601b0.c +++ b/src/game/game_0601b0.c @@ -345987,7 +345987,7 @@ glabel func0f191fa4 /* f1921a0: 8f19004c */ lw $t9,0x4c($t8) /* f1921a4: 57200010 */ bnezl $t9,.L0f1921e8 /* f1921a8: 8fbf0014 */ lw $ra,0x14($sp) -/* f1921ac: 0fc12524 */ jal func0f049490 +/* f1921ac: 0fc12524 */ jal chrGetLateralDistanceToCoord /* f1921b0: e7a2001c */ swc1 $f2,0x1c($sp) /* f1921b4: 3c014348 */ lui $at,0x4348 /* f1921b8: 44819000 */ mtc1 $at,$f18