From 2190a7435f075c23e583b23532bba9210f06d833 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Thu, 24 Dec 2020 17:22:55 +1000
Subject: [PATCH] Decompile func0f06a550

---
 src/game/propobj.c         | 19 ++++---------------
 src/include/game/propobj.h |  2 +-
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/game/propobj.c b/src/game/propobj.c
index 8cff4dfe9..a51645522 100644
--- a/src/game/propobj.c
+++ b/src/game/propobj.c
@@ -5181,21 +5181,10 @@ glabel func0f06a52c
 /*  f06a54c:	00000000 */ 	nop
 );
 
-GLOBAL_ASM(
-glabel func0f06a550
-/*  f06a550:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f06a554:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f06a558:	848e0004 */ 	lh	$t6,0x4($a0)
-/*  f06a55c:	3c058008 */ 	lui	$a1,%hi(g_Props)
-/*  f06a560:	000e78c0 */ 	sll	$t7,$t6,0x3
-/*  f06a564:	00af2821 */ 	addu	$a1,$a1,$t7
-/*  f06a568:	0fc1a94b */ 	jal	func0f06a52c
-/*  f06a56c:	8ca5b06c */ 	lw	$a1,%lo(g_Props)($a1)
-/*  f06a570:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f06a574:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f06a578:	03e00008 */ 	jr	$ra
-/*  f06a57c:	00000000 */ 	nop
-);
+struct prop *func0f06a550(struct singlemonitorobj *monitor)
+{
+	return func0f06a52c(monitor, g_Props[monitor->base.modelnum].filedata);
+}
 
 GLOBAL_ASM(
 glabel func0f06a580
diff --git a/src/include/game/propobj.h b/src/include/game/propobj.h
index 0cb3fed04..21e539c86 100644
--- a/src/include/game/propobj.h
+++ b/src/include/game/propobj.h
@@ -91,7 +91,7 @@ u32 func0f069cd8(void);
 u32 func0f069d38(void);
 u32 func0f06a170(void);
 u32 func0f06a1ec(void);
-u32 func0f06a52c(void);
+struct prop *func0f06a52c(struct singlemonitorobj *monitor, struct model08 *model08);
 struct prop *func0f06a550(struct singlemonitorobj *monitor);
 u32 func0f06a580(void);
 f32 func0f06a620(struct defaultobj *obj);