From 7971b99e07323ec6996fef0088d1bae3a908416e Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Wed, 25 Dec 2019 14:11:20 +1000
Subject: [PATCH] Decompile func0f022084

---
 src/game/chr/chr.c         | 17 ++++-------------
 src/include/game/chr/chr.h |  4 ++--
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c
index 415ca6e1d..7759f28aa 100644
--- a/src/game/chr/chr.c
+++ b/src/game/chr/chr.c
@@ -5385,19 +5385,10 @@ glabel func0f021fa8
 /*  f022080:	00000000 */ 	sll	$zero,$zero,0x0
 );
 
-GLOBAL_ASM(
-glabel func0f022084
-/*  f022084:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f022088:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f02208c:	00a03025 */ 	or	$a2,$a1,$zero
-/*  f022090:	8c85001c */ 	lw	$a1,0x1c($a0)
-/*  f022094:	0fc087ea */ 	jal	func0f021fa8
-/*  f022098:	24a50008 */ 	addiu	$a1,$a1,0x8
-/*  f02209c:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f0220a0:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f0220a4:	03e00008 */ 	jr	$ra
-/*  f0220a8:	00000000 */ 	sll	$zero,$zero,0x0
-);
+void func0f022084(struct chrdata *chr, s32 arg1)
+{
+	func0f021fa8(chr, &chr->pos->coord, arg1);
+}
 
 GLOBAL_ASM(
 glabel func0f0220ac
diff --git a/src/include/game/chr/chr.h b/src/include/game/chr/chr.h
index 174a6ac80..52b3fac6b 100644
--- a/src/include/game/chr/chr.h
+++ b/src/include/game/chr/chr.h
@@ -57,8 +57,8 @@ u32 func0f021258(void);
 u32 func0f02133c(void);
 u32 func0f0213a0(void);
 u32 func0f02143c(void);
-u32 func0f021fa8(void);
-u32 func0f022084(void);
+void func0f021fa8(struct chrdata *chr, struct coord *coord, s32 arg2);
+void func0f022084(struct chrdata *chr, s32 arg1);
 u32 func0f0220ac(struct chrdata *chr);
 u32 func0f0220ec(void);
 u32 func0f022214(void);