From 327f556fffc0179f5fd9b4aaa7f62c119e1f9f76 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sat, 16 Nov 2019 11:15:59 +1000
Subject: [PATCH] Decompile func0f000850 and func0f000860

---
 ld/stage1.ld                   |  2 ++
 src/game/game_000850.c         | 22 ++++------------------
 src/game/game_000860.c         |  9 +++++++++
 src/include/game/game_000850.h |  1 -
 src/include/game/game_000860.h |  8 ++++++++
 5 files changed, 23 insertions(+), 19 deletions(-)
 create mode 100644 src/game/game_000860.c
 create mode 100644 src/include/game/game_000860.h

diff --git a/ld/stage1.ld b/ld/stage1.ld
index 1d9ce8636..0e74cce4c 100644
--- a/ld/stage1.ld
+++ b/ld/stage1.ld
@@ -35,6 +35,7 @@ SECTIONS
 		src/game/game_000090.o (.text);
 		src/game/game_000130.o (.text);
 		src/game/game_000850.o (.text);
+		src/game/game_000860.o (.text);
 		src/game/game_000870.o (.text);
 		src/game/game_0008e0.o (.text);
 		src/game/game_0008f0.o (.text);
@@ -117,6 +118,7 @@ SECTIONS
 		src/game/game_000090.o (.rodata);
 		src/game/game_000130.o (.rodata);
 		src/game/game_000850.o (.rodata);
+		src/game/game_000860.o (.rodata);
 		src/game/game_000870.o (.rodata);
 		src/game/game_0008e0.o (.rodata);
 		src/game/game_0008f0.o (.rodata);
diff --git a/src/game/game_000850.c b/src/game/game_000850.c
index 57a97b9ab..f78986f64 100644
--- a/src/game/game_000850.c
+++ b/src/game/game_000850.c
@@ -1,23 +1,9 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "gvars/gvars.h"
-#include "setup/setup_000000.h"
-#include "setup/setup_0160b0.h"
-#include "setup/setup_020df0.h"
 #include "types.h"
 
-GLOBAL_ASM(
-glabel func0f000850
-/*  f000850:	03e00008 */ 	jr	$ra
-/*  f000854:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f000858:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f00085c:	00000000 */ 	sll	$zero,$zero,0x0
-);
-
-GLOBAL_ASM(
-glabel func0f000860
-/*  f000860:	03e00008 */ 	jr	$ra
-/*  f000864:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f000868:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f00086c:	00000000 */ 	sll	$zero,$zero,0x0
-);
\ No newline at end of file
+void func0f000850(void)
+{
+	// empty
+}
diff --git a/src/game/game_000860.c b/src/game/game_000860.c
new file mode 100644
index 000000000..92951e77c
--- /dev/null
+++ b/src/game/game_000860.c
@@ -0,0 +1,9 @@
+#include <ultra64.h>
+#include "constants.h"
+#include "gvars/gvars.h"
+#include "types.h"
+
+void func0f000860(void)
+{
+	// empty
+}
diff --git a/src/include/game/game_000850.h b/src/include/game/game_000850.h
index 8c3abe43a..79a0c2722 100644
--- a/src/include/game/game_000850.h
+++ b/src/include/game/game_000850.h
@@ -4,6 +4,5 @@
 #include "types.h"
 
 u32 func0f000850(void);
-u32 func0f000860(void);
 
 #endif
diff --git a/src/include/game/game_000860.h b/src/include/game/game_000860.h
new file mode 100644
index 000000000..e588fc6d9
--- /dev/null
+++ b/src/include/game/game_000860.h
@@ -0,0 +1,8 @@
+#ifndef IN_GAME_GAME_000860_H
+#define IN_GAME_GAME_000860_H
+#include <ultra64.h>
+#include "types.h"
+
+u32 func0f000860(void);
+
+#endif