From 28f3b6c21a625b2d84f9c4134247698510e6fbcb Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Wed, 26 Aug 2020 22:58:56 +1000
Subject: [PATCH] Decompile func0f0aed3c

---
 src/game/game_0abe70.c         | 22 ++++++----------------
 src/include/game/game_0abe70.h |  4 ++--
 src/include/types.h            |  4 +---
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/src/game/game_0abe70.c b/src/game/game_0abe70.c
index 95a0e060e..91f8dacc9 100644
--- a/src/game/game_0abe70.c
+++ b/src/game/game_0abe70.c
@@ -3320,22 +3320,12 @@ glabel func0f0aeca8
 /*  f0aed38:	00000000 */ 	nop
 );
 
-GLOBAL_ASM(
-glabel func0f0aed3c
-/*  f0aed3c:	00047080 */ 	sll	$t6,$a0,0x2
-/*  f0aed40:	c4a40000 */ 	lwc1	$f4,0x0($a1)
-/*  f0aed44:	01c47023 */ 	subu	$t6,$t6,$a0
-/*  f0aed48:	3c0f800a */ 	lui	$t7,%hi(var8009da60)
-/*  f0aed4c:	25efda60 */ 	addiu	$t7,$t7,%lo(var8009da60)
-/*  f0aed50:	000e7100 */ 	sll	$t6,$t6,0x4
-/*  f0aed54:	01cf1021 */ 	addu	$v0,$t6,$t7
-/*  f0aed58:	e4440014 */ 	swc1	$f4,0x14($v0)
-/*  f0aed5c:	c4a60004 */ 	lwc1	$f6,0x4($a1)
-/*  f0aed60:	e4460018 */ 	swc1	$f6,0x18($v0)
-/*  f0aed64:	c4a80008 */ 	lwc1	$f8,0x8($a1)
-/*  f0aed68:	03e00008 */ 	jr	$ra
-/*  f0aed6c:	e448001c */ 	swc1	$f8,0x1c($v0)
-);
+void func0f0aed3c(s32 index, struct coord *coord)
+{
+	var8009da60[index].unk14.x = coord->x;
+	var8009da60[index].unk14.y = coord->y;
+	var8009da60[index].unk14.z = coord->z;
+}
 
 void func0f0aed70(s32 index, struct coord *coord)
 {
diff --git a/src/include/game/game_0abe70.h b/src/include/game/game_0abe70.h
index e78530358..06ca9ce85 100644
--- a/src/include/game/game_0abe70.h
+++ b/src/include/game/game_0abe70.h
@@ -5,7 +5,7 @@
 
 u32 func0f0abe70(void);
 u32 func0f0ac138(void);
-Gfx *func0f0ac4b8(Gfx *gdl, u32 arg1, f32 arg2, u32 *arg3, u32 colour1, f32 arg5, struct coord *arg6, u32 colour2);
+Gfx *func0f0ac4b8(Gfx *gdl, u32 arg1, f32 arg2, struct coord *arg3, u32 colour1, f32 arg5, struct coord *arg6, u32 colour2);
 u32 func0f0acb90(void);
 void bullettailTick(struct bullettail *bullettail);
 u32 func0f0adcc8(void);
@@ -14,7 +14,7 @@ u32 func0f0ae964(void);
 u32 func0f0aebe0(void);
 u32 func0f0aec54(void);
 u32 func0f0aeca8(void);
-u32 func0f0aed3c(void);
+void func0f0aed3c(s32 index, struct coord *coord);
 void func0f0aed70(s32 index, struct coord *coord);
 u32 func0f0aeda4(void);
 void func0f0aeea8(s32 index, f32 arg1);
diff --git a/src/include/types.h b/src/include/types.h
index bd0a18d10..fd137aed8 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -6412,9 +6412,7 @@ struct var8009da60 {
 	u32 unk08;
 	u32 unk0c;
 	u32 unk10;
-	u32 unk14;
-	u32 unk18;
-	u32 unk1c;
+	struct coord unk14;
 	struct coord unk20;
 	f32 unk2c;
 };