From b356545489c51df1605d1c6f477dfa71daea00c2 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sat, 16 Nov 2019 11:12:28 +1000
Subject: [PATCH] Decompile func0f015400 and func0f015410

---
 ld/stage1.ld                   |  2 ++
 src/game/game_015400.c         | 22 ++++------------------
 src/game/game_015410.c         |  9 +++++++++
 src/include/game/game_015400.h |  3 +--
 src/include/game/game_015410.h |  8 ++++++++
 5 files changed, 24 insertions(+), 20 deletions(-)
 create mode 100644 src/game/game_015410.c
 create mode 100644 src/include/game/game_015410.h

diff --git a/ld/stage1.ld b/ld/stage1.ld
index 6066983bf..847a8b6d8 100644
--- a/ld/stage1.ld
+++ b/ld/stage1.ld
@@ -58,6 +58,7 @@ SECTIONS
 		src/game/game_015260.o (.text);
 		src/game/game_015280.o (.text);
 		src/game/game_015400.o (.text);
+		src/game/game_015410.o (.text);
 		src/game/game_015420.o (.text);
 		src/game/game_015470.o (.text);
 		src/game/game_01d860.o (.text);
@@ -138,6 +139,7 @@ SECTIONS
 		src/game/game_015260.o (.rodata);
 		src/game/game_015280.o (.rodata);
 		src/game/game_015400.o (.rodata);
+		src/game/game_015410.o (.rodata);
 		src/game/game_015420.o (.rodata);
 		src/game/game_015470.o (.rodata);
 		src/game/game_01d860.o (.rodata);
diff --git a/src/game/game_015400.c b/src/game/game_015400.c
index c507393bb..ea9596a28 100644
--- a/src/game/game_015400.c
+++ b/src/game/game_015400.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 func0f015400
-/*  f015400:	03e00008 */ 	jr	$ra
-/*  f015404:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f015408:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f01540c:	00000000 */ 	sll	$zero,$zero,0x0
-);
-
-GLOBAL_ASM(
-glabel func0f015410
-/*  f015410:	03e00008 */ 	jr	$ra
-/*  f015414:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f015418:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f01541c:	00000000 */ 	sll	$zero,$zero,0x0
-);
\ No newline at end of file
+void func0f015400(void)
+{
+	// empty
+}
diff --git a/src/game/game_015410.c b/src/game/game_015410.c
new file mode 100644
index 000000000..d342c8e27
--- /dev/null
+++ b/src/game/game_015410.c
@@ -0,0 +1,9 @@
+#include <ultra64.h>
+#include "constants.h"
+#include "gvars/gvars.h"
+#include "types.h"
+
+void func0f015410(void)
+{
+	// empty
+}
diff --git a/src/include/game/game_015400.h b/src/include/game/game_015400.h
index dfebd3e35..22bb9d061 100644
--- a/src/include/game/game_015400.h
+++ b/src/include/game/game_015400.h
@@ -3,7 +3,6 @@
 #include <ultra64.h>
 #include "types.h"
 
-u32 func0f015400(void);
-u32 func0f015410(void);
+void func0f015400(void);
 
 #endif
diff --git a/src/include/game/game_015410.h b/src/include/game/game_015410.h
new file mode 100644
index 000000000..27d5d689a
--- /dev/null
+++ b/src/include/game/game_015410.h
@@ -0,0 +1,8 @@
+#ifndef IN_GAME_GAME_015410_H
+#define IN_GAME_GAME_015410_H
+#include <ultra64.h>
+#include "types.h"
+
+void func0f015410(void);
+
+#endif