From a012cdcb4cd100b70151a4c48f0faf5602351be5 Mon Sep 17 00:00:00 2001
From: Seth Barberee <seth.barberee@gmail.com>
Date: Fri, 24 Nov 2023 09:53:18 -0800
Subject: [PATCH] decomp sub_80416A4

---
 asm/code_8040094.s | 32 --------------------------------
 src/code_8041AD0.c |  9 +++++++++
 2 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/asm/code_8040094.s b/asm/code_8040094.s
index 19855207e..ce9271263 100644
--- a/asm/code_8040094.s
+++ b/asm/code_8040094.s
@@ -2771,36 +2771,4 @@ _08041692:
 	bx r1
 	thumb_func_end sub_8041550
 
-	thumb_func_start sub_80416A4
-sub_80416A4:
-	push {r4,lr}
-	sub sp, 0x8
-	lsls r2, 24
-	lsrs r2, 24
-	movs r3, 0
-	ldrsh r4, [r0, r3]
-	lsls r3, r4, 1
-	adds r3, r4
-	lsls r3, 11
-	movs r4, 0xC0
-	lsls r4, 4
-	adds r3, r4
-	str r3, [sp]
-	movs r4, 0x2
-	ldrsh r3, [r0, r4]
-	lsls r0, r3, 1
-	adds r0, r3
-	lsls r0, 11
-	movs r3, 0x80
-	lsls r3, 5
-	adds r0, r3
-	str r0, [sp, 0x4]
-	mov r0, sp
-	bl sub_80416E0
-	add sp, 0x8
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80416A4
-
         .align 2,0
diff --git a/src/code_8041AD0.c b/src/code_8041AD0.c
index e4ce85d0b..fa42b5005 100644
--- a/src/code_8041AD0.c
+++ b/src/code_8041AD0.c
@@ -71,7 +71,16 @@ extern u8 sub_800E9A8(u32);
 extern u32 sub_800E890(unkStruct_80416E0 *);
 
 u32 sub_8041764(unkStruct_80416E0 *param_1, u8 param_2);
+s32 sub_80416E0(Position32 *pos, u32 param_2, u8 param_3);
 
+s32 sub_80416A4(Position *pos_1, u32 param_2, u8 param_3)
+{
+  Position32 pos;
+  
+  pos.x = pos_1->x * 0x1800 + 0xc00;
+  pos.y = pos_1->y * 0x1800 + 0x1000;
+  return sub_80416E0(&pos, param_2, param_3);
+}
 
 s32 sub_80416E0(Position32 *pos, u32 param_2, u8 param_3)
 {