From 3d5503a120671b8701b7d8365b303c5009d201eb Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Thu, 30 Jul 2020 19:42:46 +1000
Subject: [PATCH] Decompile func0f0c1ba4

---
 src/game/game_0b63b0.c         | 24 ++++++++----------------
 src/include/game/game_0b63b0.h |  2 +-
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c
index a74bdee84..886195f43 100644
--- a/src/game/game_0b63b0.c
+++ b/src/game/game_0b63b0.c
@@ -13473,22 +13473,14 @@ glabel func0f0c1840
 /*  f0c1ba0:	27bd00c0 */ 	addiu	$sp,$sp,0xc0
 );
 
-GLOBAL_ASM(
-glabel func0f0c1ba4
-/*  f0c1ba4:	27bdffd8 */ 	addiu	$sp,$sp,-40
-/*  f0c1ba8:	8fae0038 */ 	lw	$t6,0x38($sp)
-/*  f0c1bac:	afbf001c */ 	sw	$ra,0x1c($sp)
-/*  f0c1bb0:	240fffff */ 	addiu	$t7,$zero,-1
-/*  f0c1bb4:	27b80024 */ 	addiu	$t8,$sp,0x24
-/*  f0c1bb8:	a7af0026 */ 	sh	$t7,0x26($sp)
-/*  f0c1bbc:	afb80010 */ 	sw	$t8,0x10($sp)
-/*  f0c1bc0:	0fc30610 */ 	jal	func0f0c1840
-/*  f0c1bc4:	a7ae0024 */ 	sh	$t6,0x24($sp)
-/*  f0c1bc8:	8fbf001c */ 	lw	$ra,0x1c($sp)
-/*  f0c1bcc:	27bd0028 */ 	addiu	$sp,$sp,0x28
-/*  f0c1bd0:	03e00008 */ 	jr	$ra
-/*  f0c1bd4:	00000000 */ 	nop
-);
+void func0f0c1ba4(struct coord *pos, struct coord *up, struct coord *look, struct coord *memcampos, s32 memcamroom)
+{
+	s16 rooms[2];
+	rooms[0] = memcamroom;
+	rooms[1] = -1;
+
+	func0f0c1840(pos, up, look, memcampos, rooms);
+}
 
 void func0f0c1bd8(struct coord *pos, struct coord *up, struct coord *look)
 {
diff --git a/src/include/game/game_0b63b0.h b/src/include/game/game_0b63b0.h
index cc2876957..50c569dbb 100644
--- a/src/include/game/game_0b63b0.h
+++ b/src/include/game/game_0b63b0.h
@@ -70,7 +70,7 @@ void currentPlayerDieByShooter(u32 shooter, bool force);
 u32 func0f0c160c(void);
 u32 func0f0c16f4(void);
 void func0f0c1840(struct coord *pos, struct coord *up, struct coord *look, struct coord *pos2, s16 *rooms);
-void func0f0c1ba4(struct coord *pos, struct coord *up, struct coord *look, struct coord *memcampos, s16 memcamroom);
+void func0f0c1ba4(struct coord *pos, struct coord *up, struct coord *look, struct coord *memcampos, s32 memcamroom);
 void func0f0c1bd8(struct coord *pos, struct coord *up, struct coord *look);
 void func0f0c1d20(void);
 void func0f0c1e54(struct prop *prop, bool enable);