sub_806113C

3 files changed, 20 insertions, 93 deletions

diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
index 6051dc6e6..8aacd3c11 100644
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -1353,99 +1353,6 @@ sub_805FD08: @ 805FD08
 
 	.section .text_805fd18
 
-	thumb_func_start sub_806113C
-sub_806113C: @ 806113C
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x10
-	adds r7, r0, 0
-	mov r10, r1
-	adds r4, r2, 0
-	mov r8, r3
-	ldr r0, [sp, 0x30]
-	lsls r4, 24
-	lsrs r4, 24
-	mov r1, r8
-	lsls r1, 24
-	lsrs r1, 24
-	mov r8, r1
-	lsls r0, 24
-	lsrs r0, 24
-	mov r9, r0
-	ldr r1, _080611F4 @ =gUnknown_08375A34
-	add r0, sp, 0x4
-	movs r2, 0x6
-	bl memcpy
-	add r5, sp, 0xC
-	movs r0, 0
-	strh r0, [r5]
-	mov r6, sp
-	adds r6, 0xE
-	strh r0, [r6]
-	adds r0, r7, 0
-	adds r1, r4, 0
-	bl FieldObjectSetDirection
-	mov r1, r8
-	lsls r0, r1, 1
-	add r0, sp
-	adds r0, 0x4
-	movs r1, 0
-	ldrsh r3, [r0, r1]
-	str r3, [sp]
-	adds r0, r4, 0
-	adds r1, r5, 0
-	adds r2, r6, 0
-	bl sub_8060320
-	ldrh r1, [r5]
-	ldrh r0, [r7, 0x10]
-	adds r1, r0
-	lsls r1, 16
-	asrs r1, 16
-	ldrh r2, [r6]
-	ldrh r0, [r7, 0x12]
-	adds r2, r0
-	lsls r2, 16
-	asrs r2, 16
-	adds r0, r7, 0
-	bl npc_coords_shift
-	mov r0, r10
-	adds r1, r4, 0
-	mov r2, r8
-	mov r3, r9
-	bl sub_80646E4
-	movs r0, 0x1
-	mov r1, r10
-	strh r0, [r1, 0x32]
-	movs r0, 0x2C
-	add r10, r0
-	mov r0, r10
-	ldrb r1, [r0]
-	movs r0, 0x41
-	negs r0, r0
-	ands r0, r1
-	mov r1, r10
-	strb r0, [r1]
-	ldrb r0, [r7]
-	movs r1, 0x4
-	orrs r0, r1
-	movs r1, 0x10
-	orrs r0, r1
-	strb r0, [r7]
-	add sp, 0x10
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080611F4: .4byte gUnknown_08375A34
-	thumb_func_end sub_806113C
-
 	thumb_func_start maybe_shadow_1
 maybe_shadow_1: @ 80611F8
 	push {r4,r5,lr}
diff --git a/include/field_map_obj_helpers.h b/include/field_map_obj_helpers.h
index a61dcc63c..f8554587c 100644
--- a/include/field_map_obj_helpers.h
+++ b/include/field_map_obj_helpers.h
@@ -11,5 +11,6 @@ void UnfreezeMapObject(struct MapObject *mapObject);
 void oamt_npc_ministep_reset(struct Sprite *sprite, u8 a2, u8 a3);
 void sub_806467C(struct Sprite *sprite, u8 direction);
 bool8 sub_806468C(struct Sprite *sprite);
+void sub_80646E4(struct Sprite *sprite, u8 a2, u8 a3, u8 a4);
 
 #endif
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index 8c85e7b6d..7e245410c 100755
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -4416,3 +4416,22 @@ bool8 sub_806111C(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
+extern const s16 gUnknown_08375A34[3];
+
+void sub_806113C(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 a4, u8 a5)
+{
+    s16 vSPp4[3];
+    s16 x;
+    s16 y;
+    memcpy(vSPp4, gUnknown_08375A34, sizeof gUnknown_08375A34);
+    x = 0;
+    y = 0;
+    FieldObjectSetDirection(mapObject, direction);
+    sub_8060320(direction, &x, &y, vSPp4[a4], vSPp4[a4]);
+    npc_coords_shift(mapObject, mapObject->coords2.x + x, mapObject->coords2.y + y);
+    sub_80646E4(sprite, direction, a4, a5);
+    sprite->data2 = 1;
+    sprite->animPaused = 0;
+    mapObject->mapobj_bit_2 = 1;
+    mapObject->mapobj_bit_4 = 1;
+}