From ff9cd7ffa56fbd0ee15cc3a2c8024b6863a25940 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Mon, 17 Feb 2020 23:13:12 +1000
Subject: [PATCH] Decompile func0f092304

---
 src/game/game_066310.c         | 21 ++++-----------------
 src/include/game/game_066310.h |  4 ++--
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/game/game_066310.c b/src/game/game_066310.c
index a9795c599..b281c85ea 100644
--- a/src/game/game_066310.c
+++ b/src/game/game_066310.c
@@ -50156,23 +50156,10 @@ glabel func0f09220c
 /*  f092300:	27bd0028 */ 	addiu	$sp,$sp,0x28
 );
 
-GLOBAL_ASM(
-glabel func0f092304
-/*  f092304:	27bdffe0 */ 	addiu	$sp,$sp,-32
-/*  f092308:	afa60028 */ 	sw	$a2,0x28($sp)
-/*  f09230c:	afbf001c */ 	sw	$ra,0x1c($sp)
-/*  f092310:	00a03825 */ 	or	$a3,$a1,$zero
-/*  f092314:	8c850014 */ 	lw	$a1,0x14($a0)
-/*  f092318:	8fae0028 */ 	lw	$t6,0x28($sp)
-/*  f09231c:	2486001c */ 	addiu	$a2,$a0,0x1c
-/*  f092320:	24a50008 */ 	addiu	$a1,$a1,0x8
-/*  f092324:	0fc24883 */ 	jal	func0f09220c
-/*  f092328:	afae0010 */ 	sw	$t6,0x10($sp)
-/*  f09232c:	8fbf001c */ 	lw	$ra,0x1c($sp)
-/*  f092330:	27bd0020 */ 	addiu	$sp,$sp,0x20
-/*  f092334:	03e00008 */ 	jr	$ra
-/*  f092338:	00000000 */ 	sll	$zero,$zero,0x0
-);
+bool func0f092304(struct defaultobj *obj, u32 arg1, u32 arg2)
+{
+	return func0f09220c(obj, &obj->prop->pos, obj->realrot, arg1, arg2);
+}
 
 GLOBAL_ASM(
 glabel func0f09233c
diff --git a/src/include/game/game_066310.h b/src/include/game/game_066310.h
index 2b12efbcb..97a8ce4ac 100644
--- a/src/include/game/game_066310.h
+++ b/src/include/game/game_066310.h
@@ -344,8 +344,8 @@ u32 *setupGetPtrToCommandByIndex(u32 cmdindex);
 u32 func0f092098(struct tag *tag);
 u32 func0f092124(void);
 u32 func0f0921b4(s32 modelnum);
-u32 func0f09220c(void);
-u32 func0f092304(void);
+bool func0f09220c(struct defaultobj *obj, struct coord *pos, f32 *realrot, u32 arg3, u32 arg4);
+bool func0f092304(struct defaultobj *obj, u32 arg1, u32 arg2);
 void func0f09233c(struct defaultobj *obj, struct coord *pos, f32 *realrot, s16 *rooms);
 void func0f0923d4(struct defaultobj *obj);
 struct defaultobj *setupCommandGetObject(u32 cmdindex);