From 3e8853c0ffa1aca80da0163cb8ad074f31f2dfa9 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 19 Dec 2019 17:51:10 +1000 Subject: [PATCH] Identify chrRunToPos --- src/game/chr/chr.c | 6 +++--- src/include/game/chr/chr.h | 4 ++-- src/include/types.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index 2c3fb5355..72f50012a 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -21057,7 +21057,7 @@ glabel func0f02fe18 ); GLOBAL_ASM( -glabel func0f030078 +glabel chrRunToPos /* f030078: 27bdffe0 */ addiu $sp,$sp,-32 /* f03007c: afbf001c */ sw $ra,0x1c($sp) /* f030080: afb00018 */ sw $s0,0x18($sp) @@ -32268,7 +32268,7 @@ glabel func0f039e28 /* f039f30: 10400006 */ beqz $v0,.L0f039f4c /* f039f34: c7b00030 */ lwc1 $f16,0x30($sp) /* f039f38: 02202025 */ or $a0,$s1,$zero -/* f039f3c: 0fc0c01e */ jal func0f030078 +/* f039f3c: 0fc0c01e */ jal chrRunToPos /* f039f40: 27a50024 */ addiu $a1,$sp,0x24 /* f039f44: 1000001c */ beqz $zero,.L0f039fb8 /* f039f48: 24020001 */ addiu $v0,$zero,0x1 @@ -32295,7 +32295,7 @@ glabel func0f039e28 /* f039f98: e7a4002c */ swc1 $f4,0x2c($sp) /* f039f9c: 10400005 */ beqz $v0,.L0f039fb4 /* f039fa0: 02202025 */ or $a0,$s1,$zero -/* f039fa4: 0fc0c01e */ jal func0f030078 +/* f039fa4: 0fc0c01e */ jal chrRunToPos /* f039fa8: 27a50024 */ addiu $a1,$sp,0x24 /* f039fac: 10000002 */ beqz $zero,.L0f039fb8 /* f039fb0: 24020001 */ addiu $v0,$zero,0x1 diff --git a/src/include/game/chr/chr.h b/src/include/game/chr/chr.h index d43c544b8..eb4bcb17f 100644 --- a/src/include/game/chr/chr.h +++ b/src/include/game/chr/chr.h @@ -156,8 +156,8 @@ u32 func0f02f8a4(struct chrdata *chr); void chrSidestep(struct chrdata *chr, s32 arg1); void func0f02fc2c(struct chrdata *chr); void chrJumpOut(struct chrdata *chr, s32 arg1); -u32 func0f02fe18(void); -u32 func0f030078(void); +void func0f02fe18(struct chrdata *chr); +void chrRunToPos(struct chrdata *chr, struct coord *coord); u32 func0f030120(void); u32 func0f030308(void); u32 func0f0303a0(void); diff --git a/src/include/types.h b/src/include/types.h index 20bb00799..d1944f074 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -105,7 +105,7 @@ struct chrdata { /*0x02c*/ u32 unk02c; /*0x030*/ u32 unk030; /*0x034*/ u32 unk034; - /*0x038*/ s32 unk038; + /*0x038*/ u32 unk038; /*0x03c*/ u32 unk03c; /*0x040*/ u32 unk040; /*0x044*/ u32 unk044;