Through sub_806A18C

4 files changed, 18 insertions, 59 deletions

diff --git a/asm/field_tasks.s b/asm/field_tasks.s
index 99c54a0d4..3b5eb1021 100755
--- a/asm/field_tasks.s
+++ b/asm/field_tasks.s
@@ -6,56 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_806A18C
-sub_806A18C: @ 806A18C
-	push {r4,r5,lr}
-	adds r3, r0, 0
-	lsls r1, 16
-	lsrs r5, r1, 16
-	lsls r2, 16
-	lsrs r4, r2, 16
-	ldrh r0, [r3]
-	subs r0, 0x1
-	strh r0, [r3]
-	lsls r0, 16
-	cmp r0, 0
-	bne _0806A1A8
-	movs r2, 0xE8
-	b _0806A1BC
-_0806A1A8:
-	ldr r1, _0806A1E4 @ =gUnknown_08376418
-	movs r2, 0
-	ldrsh r0, [r3, r2]
-	cmp r0, 0
-	bge _0806A1B4
-	adds r0, 0x7
-_0806A1B4:
-	asrs r0, 3
-	lsls r0, 1
-	adds r0, r1
-	ldrh r2, [r0]
-_0806A1BC:
-	lsls r5, 16
-	asrs r5, 16
-	lsls r4, 16
-	asrs r4, 16
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl MapGridSetMetatileIdAt
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl CurrentMapDrawMetatileAt
-	adds r0, r5, 0
-	adds r1, r4, 0
-	movs r2, 0xE8
-	bl MapGridSetMetatileIdAt
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0806A1E4: .4byte gUnknown_08376418
-	thumb_func_end sub_806A18C
-
 	thumb_func_start Task_MuddySlope
 Task_MuddySlope: @ 806A1E8
 	push {r4-r7,lr}
diff --git a/data/field_tasks.s b/data/field_tasks.s
deleted file mode 100755
index faaa12342..000000000
--- a/data/field_tasks.s
+++ /dev/null
@@ -1,8 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 1
-gUnknown_08376418:: @ 8376418
-	.2byte 0xE8, 0xEB, 0xEA, 0xE9
diff --git a/ld_script.txt b/ld_script.txt
index 16dbf689e..77f404893 100755
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -362,7 +362,6 @@ SECTIONS {
         src/scrcmd.o(.rodata);
         src/coord_event_weather.o(.rodata);
         src/field_tasks.o(.rodata);
-        data/field_tasks.o(.rodata);
         data/reset_rtc_screen.o(.rodata);
         data/party_menu.o(.rodata);
         src/start_menu.o(.rodata);
diff --git a/src/field_tasks.c b/src/field_tasks.c
index 653d3ffd9..8ddef126b 100755
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -776,3 +776,21 @@ void PerStepCallback_806A07C(u8 taskId)
         }
     }
 }
+
+const u16 gUnknown_08376418[] = {0xe8, 0xeb, 0xea, 0xe9};
+
+void sub_806A18C(s16 *data, s16 x, s16 y)
+{
+    u16 tile;
+    if ((--data[0]) == 0)
+    {
+        tile = 0xe8;
+    }
+    else
+    {
+        tile = gUnknown_08376418[data[0] / 8];
+    }
+    MapGridSetMetatileIdAt(x, y, tile);
+    CurrentMapDrawMetatileAt(x, y);
+    MapGridSetMetatileIdAt(x, y, 0xe8);
+}