From 2bd5175be6cf7af7a24084e4176dc92b5714e260 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Tue, 5 May 2020 21:00:47 +1000
Subject: [PATCH] Decompile func0f0cc654

---
 src/game/bondmove.c         | 20 +++++---------------
 src/include/game/bondmove.h |  4 ++--
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/game/bondmove.c b/src/game/bondmove.c
index f5b27fcc0..97535812b 100644
--- a/src/game/bondmove.c
+++ b/src/game/bondmove.c
@@ -5529,7 +5529,7 @@ void func0f0cc19c(struct coord *arg)
 	}
 }
 
-void func0f0cc3b8(f32 arg0, f32 arg1, f32 arg2, f32 *arg3, f32 arg4, u32 arg5)
+void func0f0cc3b8(f32 arg0, f32 arg1, f32 arg2, f32 *arg3, f32 arg4)
 {
 	f32 sp244 = 0;
 	f32 sp180[16];
@@ -5586,20 +5586,10 @@ void func0f0cc3b8(f32 arg0, f32 arg1, f32 arg2, f32 *arg3, f32 arg4, u32 arg5)
 	g_Vars.currentplayer->bond2.unk28.z = sp180[6];
 }
 
-GLOBAL_ASM(
-glabel func0f0cc654
-/*  f0cc654:	44802000 */ 	mtc1	$zero,$f4
-/*  f0cc658:	27bdffe0 */ 	addiu	$sp,$sp,-32
-/*  f0cc65c:	afbf001c */ 	sw	$ra,0x1c($sp)
-/*  f0cc660:	afa60028 */ 	sw	$a2,0x28($sp)
-/*  f0cc664:	00003825 */ 	or	$a3,$zero,$zero
-/*  f0cc668:	0fc330ee */ 	jal	func0f0cc3b8
-/*  f0cc66c:	e7a40010 */ 	swc1	$f4,0x10($sp)
-/*  f0cc670:	8fbf001c */ 	lw	$ra,0x1c($sp)
-/*  f0cc674:	27bd0020 */ 	addiu	$sp,$sp,0x20
-/*  f0cc678:	03e00008 */ 	jr	$ra
-/*  f0cc67c:	00000000 */ 	sll	$zero,$zero,0x0
-);
+void func0f0cc654(f32 arg0, f32 arg1, f32 arg2)
+{
+	func0f0cc3b8(arg0, arg1, arg2, NULL, 0);
+}
 
 s32 currentPlayerGetCrouchPos(void)
 {
diff --git a/src/include/game/bondmove.h b/src/include/game/bondmove.h
index 637978919..ce859e173 100644
--- a/src/include/game/bondmove.h
+++ b/src/include/game/bondmove.h
@@ -38,8 +38,8 @@ void currentPlayerUpdateMoveInitSpeed(struct coord *newpos);
 void currentPlayerUpdateFootsteps(bool arg0, bool arg1, bool arg2, bool arg3);
 void func0f0cbf50(void);
 void func0f0cc19c(struct coord *arg);
-void func0f0cc3b8(f32 arg0, f32 arg1, f32 arg2, f32 *arg3, f32 arg4, u32 arg5);
-u32 func0f0cc654(void);
+void func0f0cc3b8(f32 arg0, f32 arg1, f32 arg2, f32 *arg3, f32 arg4);
+void func0f0cc654(f32 arg0, f32 arg1, f32 arg2);
 s32 currentPlayerGetCrouchPos(void);
 s32 playerGetCrouchPos(s32 playernum);