From beb64024ad8ad42edcfc3ec095108ef86c31f13e Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sun, 1 Mar 2020 10:43:56 +1000
Subject: [PATCH] Decompile func0f0c8004

---
 src/game/game_0c79f0.c         | 38 +++++++++-------------------------
 src/include/game/game_0c79f0.h |  2 +-
 2 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/src/game/game_0c79f0.c b/src/game/game_0c79f0.c
index efd6a619f..d474de402 100644
--- a/src/game/game_0c79f0.c
+++ b/src/game/game_0c79f0.c
@@ -406,34 +406,16 @@ void func0f0c7f98(void)
 	}
 }
 
-GLOBAL_ASM(
-glabel func0f0c8004
-/*  f0c8004:	3c0e800a */ 	lui	$t6,0x800a
-/*  f0c8008:	8dcea244 */ 	lw	$t6,-0x5dbc($t6)
-/*  f0c800c:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f0c8010:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f0c8014:	8dc201b0 */ 	lw	$v0,0x1b0($t6)
-/*  f0c8018:	24010003 */ 	addiu	$at,$zero,0x3
-/*  f0c801c:	1041000b */ 	beq	$v0,$at,.L0f0c804c
-/*  f0c8020:	24010004 */ 	addiu	$at,$zero,0x4
-/*  f0c8024:	14410005 */ 	bne	$v0,$at,.L0f0c803c
-/*  f0c8028:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f0c802c:	0fc33a2b */ 	jal	func0f0ce8ac
-/*  f0c8030:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f0c8034:	10000006 */ 	beqz	$zero,.L0f0c8050
-/*  f0c8038:	8fbf0014 */ 	lw	$ra,0x14($sp)
-.L0f0c803c:
-/*  f0c803c:	54400004 */ 	bnezl	$v0,.L0f0c8050
-/*  f0c8040:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f0c8044:	0fc31a52 */ 	jal	func0f0c6948
-/*  f0c8048:	00000000 */ 	sll	$zero,$zero,0x0
-.L0f0c804c:
-/*  f0c804c:	8fbf0014 */ 	lw	$ra,0x14($sp)
-.L0f0c8050:
-/*  f0c8050:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f0c8054:	03e00008 */ 	jr	$ra
-/*  f0c8058:	00000000 */ 	sll	$zero,$zero,0x0
-);
+void func0f0c8004(void)
+{
+	if (g_Vars.currentplayer->bondmovemode == MOVEMODE_HOVERBIKE) {
+		// empty
+	} else if (g_Vars.currentplayer->bondmovemode == MOVEMODE_GRABBEDPROP) {
+		func0f0ce8ac();
+	} else if (g_Vars.currentplayer->bondmovemode == MOVEMODE_NORMAL) {
+		func0f0c6948();
+	}
+}
 
 GLOBAL_ASM(
 glabel func0f0c805c
diff --git a/src/include/game/game_0c79f0.h b/src/include/game/game_0c79f0.h
index 13933b4cf..d43e1d0db 100644
--- a/src/include/game/game_0c79f0.h
+++ b/src/include/game/game_0c79f0.h
@@ -21,7 +21,7 @@ void currentPlayerSetMoveMode(u32 movemode);
 void setMoveModeForAllPlayers(u32 movemode);
 void func0f0c7f2c(void);
 void func0f0c7f98(void);
-u32 func0f0c8004(void);
+void func0f0c8004(void);
 u32 func0f0c805c(void);
 u32 func0f0c80f8(void);
 u32 func0f0c82f8(void);