From 489106198973e1377d0ac823b4decaa395ca7c9e Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 22 Jun 2017 22:08:27 -0400
Subject: File modes

---
 include/gba/defines.h | 0
 include/global.h      | 0
 include/player_pc.h   | 0
 src/daycare.c         | 0
 src/field_effect.c    | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 include/gba/defines.h
 mode change 100755 => 100644 include/global.h
 mode change 100755 => 100644 include/player_pc.h
 mode change 100755 => 100644 src/daycare.c
 mode change 100755 => 100644 src/field_effect.c

diff --git a/include/gba/defines.h b/include/gba/defines.h
old mode 100755
new mode 100644
diff --git a/include/global.h b/include/global.h
old mode 100755
new mode 100644
diff --git a/include/player_pc.h b/include/player_pc.h
old mode 100755
new mode 100644
diff --git a/src/daycare.c b/src/daycare.c
old mode 100755
new mode 100644
diff --git a/src/field_effect.c b/src/field_effect.c
old mode 100755
new mode 100644
-- 
cgit v1.2.3


From 9e14c471e6176d3b9eded4815f917b4a2e06d5cc Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 22 Jun 2017 22:27:51 -0400
Subject: Start decompiling field_tasks.s

---
 asm/field_tasks.s             | 96 -------------------------------------------
 data/field_tasks.s            | 11 -----
 include/field_special_scene.h |  2 +-
 include/rom4.h                |  2 +-
 include/secret_base.h         |  1 +
 ld_script.txt                 |  2 +
 src/field_special_scene.c     |  2 +-
 src/field_tasks.c             | 67 ++++++++++++++++++++++++++++++
 8 files changed, 73 insertions(+), 110 deletions(-)
 create mode 100644 src/field_tasks.c

diff --git a/asm/field_tasks.s b/asm/field_tasks.s
index 5f3e3a03f..42bd38a3d 100644
--- a/asm/field_tasks.s
+++ b/asm/field_tasks.s
@@ -6,102 +6,6 @@
 
 	.text
 
-	thumb_func_start Task_RunPerStepCallback
-Task_RunPerStepCallback: @ 806943C
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _08069460 @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	movs r2, 0x8
-	ldrsh r1, [r1, r2]
-	ldr r2, _08069464 @ =gUnknown_08376364
-	lsls r1, 2
-	adds r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08069460: .4byte gTasks
-_08069464: .4byte gUnknown_08376364
-	thumb_func_end Task_RunPerStepCallback
-
-	thumb_func_start RunTimeBasedEvents
-RunTimeBasedEvents: @ 8069468
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r1, 0
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	beq _0806947A
-	cmp r0, 0x1
-	beq _08069498
-	b _080694AC
-_0806947A:
-	ldr r0, _08069494 @ =gMain
-	ldr r0, [r0, 0x20]
-	movs r1, 0x80
-	lsls r1, 5
-	ands r0, r1
-	cmp r0, 0
-	beq _080694AC
-	bl DoTimeBasedEvents
-	ldrh r0, [r4]
-	adds r0, 0x1
-	b _080694AA
-	.align 2, 0
-_08069494: .4byte gMain
-_08069498:
-	ldr r0, _080694B4 @ =gMain
-	ldr r0, [r0, 0x20]
-	movs r1, 0x80
-	lsls r1, 5
-	ands r0, r1
-	cmp r0, 0
-	bne _080694AC
-	ldrh r0, [r4]
-	subs r0, 0x1
-_080694AA:
-	strh r0, [r4]
-_080694AC:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080694B4: .4byte gMain
-	thumb_func_end RunTimeBasedEvents
-
-	thumb_func_start Task_RunTimeBasedEvents
-Task_RunTimeBasedEvents: @ 80694B8
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, _080694E8 @ =gTasks + 0x8
-	adds r4, r1, r0
-	bl ScriptContext2_IsEnabled
-	lsls r0, 24
-	cmp r0, 0
-	bne _080694E0
-	adds r0, r4, 0
-	bl RunTimeBasedEvents
-	adds r0, r4, 0x2
-	adds r1, r4, 0x4
-	bl sub_80540D0
-_080694E0:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080694E8: .4byte gTasks + 0x8
-	thumb_func_end Task_RunTimeBasedEvents
-
 	thumb_func_start SetUpFieldTasks
 SetUpFieldTasks: @ 80694EC
 	push {r4,r5,lr}
diff --git a/data/field_tasks.s b/data/field_tasks.s
index 122e089e6..d8b4f1146 100644
--- a/data/field_tasks.s
+++ b/data/field_tasks.s
@@ -3,17 +3,6 @@
 
 	.section .rodata
 
-	.align 2
-gUnknown_08376364:: @ 8376364
-	.4byte DummyPerStepCallback
-	.4byte PerStepCallback_8069F64
-	.4byte PerStepCallback_8069AA0
-	.4byte PerStepCallback_8069864
-	.4byte PerStepCallback_8069DD4
-	.4byte EndTruckSequence
-	.4byte sub_80BCF1C
-	.4byte PerStepCallback_806A07C
-
 gUnknown_08376384:: @ 8376384
 	.byte   0,  0,0x59,  2,  0,  1,0x61,  2
 	.byte   0, -1,0x59,  2,  0,  0,0x61,  2
diff --git a/include/field_special_scene.h b/include/field_special_scene.h
index 5841d6bce..ef3f07120 100644
--- a/include/field_special_scene.h
+++ b/include/field_special_scene.h
@@ -8,6 +8,6 @@ void Task_Truck2(u8 taskId);
 void Task_Truck3(u8 taskId);
 void Task_HandleTruckSequence(u8 taskId);
 void ExecuteTruckSequence(void);
-void EndTruckSequence(void);
+void EndTruckSequence(u8);
 
 #endif // GUARD_FIELD_SPECIAL_SCENE_H
diff --git a/include/rom4.h b/include/rom4.h
index eac4d29a2..b7415bf0a 100644
--- a/include/rom4.h
+++ b/include/rom4.h
@@ -102,7 +102,7 @@ void sub_8053FB0(u16);
 // sub_8054034
 // sub_8054044
 // sub_8054050
-// sub_80540D0
+void sub_80540D0(s16 *, u16 *);
 void sub_8054164(void);
 u8 get_map_light_level_by_bank_and_number(s8 mapGroup, s8 mapNum);
 // get_map_light_level_from_warp
diff --git a/include/secret_base.h b/include/secret_base.h
index 3ca5ab182..3ea75ce27 100644
--- a/include/secret_base.h
+++ b/include/secret_base.h
@@ -10,6 +10,7 @@ u8 sub_80BC050();
 void sub_80BC300();
 const u8 sub_80BCCA4(u8);
 u8 *sub_80BCCE8(void);
+void sub_80BCF1C(u8);
 void sub_80BD674(void *, u32, u8);
 
 #endif // GUARD_SECRET_BASE_H
diff --git a/ld_script.txt b/ld_script.txt
index 281f1781d..16dbf689e 100755
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -104,6 +104,7 @@ SECTIONS {
         src/field_control_avatar.o(.text);
         src/event_data.o(.text);
         src/coord_event_weather.o(.text);
+        src/field_tasks.o(.text);
         asm/field_tasks.o(.text);
         src/clock.o(.text);
         asm/reset_rtc_screen.o(.text);
@@ -360,6 +361,7 @@ SECTIONS {
         src/script.o(.rodata);
         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);
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
index c88ac8f65..82a7a13e3 100644
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -229,7 +229,7 @@ void ExecuteTruckSequence(void)
     CreateTask(Task_HandleTruckSequence, 0xA);
 }
 
-void EndTruckSequence(void)
+void EndTruckSequence(u8 taskId)
 {
     if (!FuncIsActiveTask(Task_HandleTruckSequence))
     {
diff --git a/src/field_tasks.c b/src/field_tasks.c
new file mode 100644
index 000000000..0b6cc2de4
--- /dev/null
+++ b/src/field_tasks.c
@@ -0,0 +1,67 @@
+//
+// Created by scott on 6/22/2017.
+//
+
+#include "global.h"
+#include "task.h"
+#include "main.h"
+#include "rom4.h"
+#include "clock.h"
+#include "script.h"
+#include "field_special_scene.h"
+#include "secret_base.h"
+#include "field_tasks.h"
+
+void DummyPerStepCallback(u8);
+void PerStepCallback_8069F64(u8);
+void PerStepCallback_8069AA0(u8);
+void PerStepCallback_8069864(u8);
+void PerStepCallback_8069DD4(u8);
+void PerStepCallback_806A07C(u8);
+
+void (*const gUnknown_08376364[])(u8) = {
+    DummyPerStepCallback,
+    PerStepCallback_8069F64,
+    PerStepCallback_8069AA0,
+    PerStepCallback_8069864,
+    PerStepCallback_8069DD4,
+    EndTruckSequence,
+    sub_80BCF1C,
+    PerStepCallback_806A07C
+};
+
+void Task_RunPerStepCallback(u8 taskId)
+{
+    int idx = gTasks[taskId].data[0];
+    gUnknown_08376364[idx](taskId);
+}
+
+void RunTimeBasedEvents(s16 *taskData)
+{
+    switch (*taskData)
+    {
+        case 0:
+            if (gMain.vblankCounter1 & 0x1000)
+            {
+                DoTimeBasedEvents();
+                (*taskData)++;
+            }
+            break;
+        case 1:
+            if (!(gMain.vblankCounter1 & 0x1000))
+            {
+                (*taskData)--;
+            }
+            break;
+    }
+}
+
+void Task_RunTimeBasedEvents(u8 taskId)
+{
+    s16 *taskData = gTasks[taskId].data;
+    if (!ScriptContext2_IsEnabled())
+    {
+        RunTimeBasedEvents(taskData);
+        sub_80540D0(taskData + 1, taskData + 2);
+    }
+}
-- 
cgit v1.2.3


From 29ed9d7aee11527bbe971dd1daa099e04d7e5bc9 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 22 Jun 2017 22:59:22 -0400
Subject: Up through ResetFieldTaskArgs

---
 asm/field_tasks.s    | 122 ---------------------------------------------------
 src/field_specials.c |   0
 src/field_tasks.c    |  65 ++++++++++++++++++++++++++-
 3 files changed, 64 insertions(+), 123 deletions(-)
 mode change 100644 => 100755 asm/field_tasks.s
 mode change 100644 => 100755 src/field_specials.c
 mode change 100644 => 100755 src/field_tasks.c

diff --git a/asm/field_tasks.s b/asm/field_tasks.s
old mode 100644
new mode 100755
index 42bd38a3d..2d2c0abe6
--- a/asm/field_tasks.s
+++ b/asm/field_tasks.s
@@ -6,128 +6,6 @@
 
 	.text
 
-	thumb_func_start SetUpFieldTasks
-SetUpFieldTasks: @ 80694EC
-	push {r4,r5,lr}
-	ldr r5, _08069548 @ =Task_RunPerStepCallback
-	adds r0, r5, 0
-	bl FuncIsActiveTask
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0
-	bne _08069516
-	adds r0, r5, 0
-	movs r1, 0x50
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _0806954C @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	strh r4, [r1, 0x8]
-_08069516:
-	ldr r4, _08069550 @ =Task_MuddySlope
-	adds r0, r4, 0
-	bl FuncIsActiveTask
-	lsls r0, 24
-	cmp r0, 0
-	bne _0806952C
-	adds r0, r4, 0
-	movs r1, 0x50
-	bl CreateTask
-_0806952C:
-	ldr r4, _08069554 @ =Task_RunTimeBasedEvents
-	adds r0, r4, 0
-	bl FuncIsActiveTask
-	lsls r0, 24
-	cmp r0, 0
-	bne _08069542
-	adds r0, r4, 0
-	movs r1, 0x50
-	bl CreateTask
-_08069542:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08069548: .4byte Task_RunPerStepCallback
-_0806954C: .4byte gTasks
-_08069550: .4byte Task_MuddySlope
-_08069554: .4byte Task_RunTimeBasedEvents
-	thumb_func_end SetUpFieldTasks
-
-	thumb_func_start ActivatePerStepCallback
-ActivatePerStepCallback: @ 8069558
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, _08069590 @ =Task_RunPerStepCallback
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0xFF
-	beq _0806959A
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	ldr r1, _08069594 @ =gTasks + 0x8
-	adds r1, r0, r1
-	movs r2, 0
-	adds r0, r1, 0
-	adds r0, 0x1E
-_0806957C:
-	strh r2, [r0]
-	subs r0, 0x2
-	cmp r0, r1
-	bge _0806957C
-	cmp r4, 0x7
-	bls _08069598
-	movs r0, 0
-	strh r0, [r1]
-	b _0806959A
-	.align 2, 0
-_08069590: .4byte Task_RunPerStepCallback
-_08069594: .4byte gTasks + 0x8
-_08069598:
-	strh r4, [r1]
-_0806959A:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end ActivatePerStepCallback
-
-	thumb_func_start ResetFieldTasksArgs
-ResetFieldTasksArgs: @ 80695A0
-	push {lr}
-	ldr r0, _080695D0 @ =Task_RunPerStepCallback
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r1, r0, 24
-	ldr r0, _080695D4 @ =Task_RunTimeBasedEvents
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0xFF
-	beq _080695CA
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	ldr r1, _080695D8 @ =gTasks + 0x8
-	adds r0, r1
-	movs r1, 0
-	strh r1, [r0, 0x2]
-	strh r1, [r0, 0x4]
-_080695CA:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080695D0: .4byte Task_RunPerStepCallback
-_080695D4: .4byte Task_RunTimeBasedEvents
-_080695D8: .4byte gTasks + 0x8
-	thumb_func_end ResetFieldTasksArgs
-
 	thumb_func_start DummyPerStepCallback
 DummyPerStepCallback: @ 80695DC
 	bx lr
diff --git a/src/field_specials.c b/src/field_specials.c
old mode 100644
new mode 100755
diff --git a/src/field_tasks.c b/src/field_tasks.c
old mode 100644
new mode 100755
index 0b6cc2de4..d52bafe1c
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -36,7 +36,7 @@ void Task_RunPerStepCallback(u8 taskId)
     gUnknown_08376364[idx](taskId);
 }
 
-void RunTimeBasedEvents(s16 *taskData)
+static void RunTimeBasedEvents(s16 *taskData)
 {
     switch (*taskData)
     {
@@ -65,3 +65,66 @@ void Task_RunTimeBasedEvents(u8 taskId)
         sub_80540D0(taskData + 1, taskData + 2);
     }
 }
+
+void Task_MuddySlope(u8);
+
+void SetUpFieldTasks(void)
+{
+    if (!FuncIsActiveTask(Task_RunPerStepCallback))
+    {
+        u8 taskId = CreateTask(Task_RunPerStepCallback, 0x50);
+        gTasks[taskId].data[0] = 0;
+    }
+    if (!FuncIsActiveTask(Task_MuddySlope))
+    {
+        CreateTask(Task_MuddySlope, 0x50);
+    }
+    if (!FuncIsActiveTask(Task_RunTimeBasedEvents))
+    {
+        CreateTask(Task_RunTimeBasedEvents, 0x50);
+    }
+}
+
+void ActivatePerStepCallback(u8 callback)
+{
+    s16 *dataPointer;
+    s16 *dataStart;
+    s16 zero;
+    u8 taskId = FindTaskIdByFunc(Task_RunPerStepCallback);
+    if (taskId != 0xff)
+    {
+        dataStart = gTasks[taskId].data;
+        zero = 0;
+        dataPointer = &dataStart[15];
+        do
+        {
+            *dataPointer-- = zero;
+        } while ((int)dataPointer >= (int)dataStart);
+        if (callback >= ARRAY_COUNT(gUnknown_08376364))
+        {
+            *dataStart = 0;
+        }
+        else
+        {
+            *dataStart = callback;
+        }
+    }
+}
+
+void ResetFieldTasksArgs(void)
+{
+    u8 taskId;
+    s16 *taskData;
+    taskId = FindTaskIdByFunc(Task_RunPerStepCallback);
+    if (taskId != 0xff)
+    {
+        taskData = gTasks[taskId].data;
+    }
+    taskId = FindTaskIdByFunc(Task_RunTimeBasedEvents);
+    if (taskId != 0xff)
+    {
+        taskData = gTasks[taskId].data;
+        taskData[1] = 0;
+        taskData[2] = 0;
+    }
+}
-- 
cgit v1.2.3


From d5db71923c6fb611760e3a21f4f44c7c56142159 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 23 Jun 2017 08:44:18 -0400
Subject: up through sub_80695E0

---
 asm/field_tasks.s     | 53 ---------------------------------------------------
 data/field_tasks.s    | 17 -----------------
 include/field_tasks.h |  6 ++++++
 src/field_specials.c  |  0
 src/field_tasks.c     | 48 ++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 54 insertions(+), 70 deletions(-)
 mode change 100755 => 100644 asm/field_tasks.s
 mode change 100755 => 100644 src/field_specials.c
 mode change 100755 => 100644 src/field_tasks.c

diff --git a/asm/field_tasks.s b/asm/field_tasks.s
old mode 100755
new mode 100644
index 2d2c0abe6..b869f2ad1
--- a/asm/field_tasks.s
+++ b/asm/field_tasks.s
@@ -6,59 +6,6 @@
 
 	.text
 
-	thumb_func_start DummyPerStepCallback
-DummyPerStepCallback: @ 80695DC
-	bx lr
-	thumb_func_end DummyPerStepCallback
-
-	thumb_func_start sub_80695E0
-sub_80695E0: @ 80695E0
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	lsls r1, 24
-	lsrs r4, r1, 24
-	adds r0, r4, 0
-	bl sub_80576A0
-	lsls r0, 24
-	cmp r0, 0
-	beq _080695F8
-	adds r0, r5, 0
-	b _08069630
-_080695F8:
-	adds r0, r4, 0
-	bl sub_80576B4
-	lsls r0, 24
-	cmp r0, 0
-	beq _0806960A
-	adds r0, r5, 0
-	adds r0, 0x8
-	b _08069630
-_0806960A:
-	adds r0, r4, 0
-	bl sub_80576C8
-	lsls r0, 24
-	cmp r0, 0
-	beq _0806961C
-	adds r0, r5, 0
-	adds r0, 0x10
-	b _08069630
-_0806961C:
-	adds r0, r4, 0
-	bl sub_80576DC
-	lsls r0, 24
-	cmp r0, 0
-	bne _0806962C
-	movs r0, 0
-	b _08069630
-_0806962C:
-	adds r0, r5, 0
-	adds r0, 0x18
-_08069630:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80695E0
-
 	thumb_func_start sub_8069638
 sub_8069638: @ 8069638
 	push {r4-r7,lr}
diff --git a/data/field_tasks.s b/data/field_tasks.s
index d8b4f1146..a4b78df2e 100644
--- a/data/field_tasks.s
+++ b/data/field_tasks.s
@@ -3,23 +3,6 @@
 
 	.section .rodata
 
-gUnknown_08376384:: @ 8376384
-	.byte   0,  0,0x59,  2,  0,  1,0x61,  2
-	.byte   0, -1,0x59,  2,  0,  0,0x61,  2
-	.byte   0,  0,0x52,  2,  1,  0,0x53,  2
-	.byte  -1,  0,0x52,  2,  0,  0,0x53,  2
-
-gUnknown_083763A4:: @ 83763A4
-	.byte   0,  0,0x5A,  2,  0,  1,0x62,  2
-	.byte   0, -1,0x5A,  2,  0,  0,0x62,  2
-	.byte   0,  0,0x54,  2,  1,  0,0x55,  2
-	.byte  -1,  0,0x54,  2,  0,  0,0x55,  2
-
-gUnknown_083763C4:: @ 83763C4
-	.byte   0,  0,0x58,  2,  0,  1,0x60,  2
-	.byte   0, -1,0x58,  2,  0,  0,0x60,  2
-	.byte   0,  0,0x50,  2,  1,  0,0x51,  2
-	.byte  -1,  0,0x50,  2,  0,  0,0x51,  2
 
 	.align 1
 gUnknown_083763E4:: @ 83763E4
diff --git a/include/field_tasks.h b/include/field_tasks.h
index 53e704395..761d69ada 100644
--- a/include/field_tasks.h
+++ b/include/field_tasks.h
@@ -1,6 +1,12 @@
 #ifndef GUARD_FIELD_TASKS_H
 #define GUARD_FIELD_TASKS_H
 
+struct MetatileOffset {
+    s8 x;
+    s8 y;
+    u16 tileId;
+};
+
 void SetUpFieldTasks();
 void ActivatePerStepCallback(u8);
 void ResetFieldTasksArgs(void);
diff --git a/src/field_specials.c b/src/field_specials.c
old mode 100755
new mode 100644
diff --git a/src/field_tasks.c b/src/field_tasks.c
old mode 100755
new mode 100644
index d52bafe1c..39c2146d6
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -10,6 +10,7 @@
 #include "script.h"
 #include "field_special_scene.h"
 #include "secret_base.h"
+#include "metatile_behavior.h"
 #include "field_tasks.h"
 
 void DummyPerStepCallback(u8);
@@ -128,3 +129,50 @@ void ResetFieldTasksArgs(void)
         taskData[2] = 0;
     }
 }
+
+const struct MetatileOffset gUnknown_08376384[][2] = {
+    {{  0,  0,0x259}, {  0,  1,0x261}},
+    {{  0, -1,0x259}, {  0,  0,0x261}},
+    {{  0,  0,0x252}, {  1,  0,0x253}},
+    {{ -1,  0,0x252}, {  0,  0,0x253}}
+};
+
+const struct MetatileOffset gUnknown_083763A4[][2] = {
+    {{  0,  0,0x25A}, {  0,  1,0x262}},
+    {{  0, -1,0x25A}, {  0,  0,0x262}},
+    {{  0,  0,0x254}, {  1,  0,0x255}},
+    {{ -1,  0,0x254}, {  0,  0,0x255}}
+};
+
+const struct MetatileOffset gUnknown_083763C4[][2] = {
+    {{  0,  0,0x258}, {  0,  1,0x260}},
+    {{  0, -1,0x258}, {  0,  0,0x260}},
+    {{  0,  0,0x250}, {  1,  0,0x251}},
+    {{ -1,  0,0x250}, {  0,  0,0x251}}
+};
+
+void DummyPerStepCallback(u8 taskId) {}
+
+const struct MetatileOffset *sub_80695E0(const struct MetatileOffset a0[][2], s8 a1)
+{
+    if (sub_80576A0(a1))
+    {
+        return a0[0];
+    }
+    else if (sub_80576B4(a1))
+    {
+        return a0[1];
+    }
+    else if (sub_80576C8(a1))
+    {
+        return a0[2];
+    }
+    else if (sub_80576DC(a1))
+    {
+        return a0[3];
+    }
+    else
+    {
+        return NULL;
+    }
+}
-- 
cgit v1.2.3


From 01890a2020676ad2567f21d9f11deeb2e3a0e2db Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 26 Jun 2017 08:24:28 -0400
Subject: Nonmatching sub_8069638 and callers

---
 asm/field_tasks.s | 131 ------------------------------------------------------
 src/field_tasks.c | 107 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 107 insertions(+), 131 deletions(-)
 mode change 100644 => 100755 asm/field_tasks.s
 mode change 100644 => 100755 src/field_tasks.c

diff --git a/asm/field_tasks.s b/asm/field_tasks.s
old mode 100644
new mode 100755
index b869f2ad1..0cccd07ba
--- a/asm/field_tasks.s
+++ b/asm/field_tasks.s
@@ -6,137 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_8069638
-sub_8069638: @ 8069638
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	adds r5, r0, 0
-	mov r8, r3
-	lsls r1, 16
-	asrs r6, r1, 16
-	lsls r2, 16
-	asrs r7, r2, 16
-	adds r0, r6, 0
-	adds r1, r7, 0
-	bl MapGridGetMetatileBehaviorAt
-	adds r1, r0, 0
-	lsls r1, 16
-	lsrs r1, 16
-	adds r0, r5, 0
-	bl sub_80695E0
-	adds r4, r0, 0
-	adds r5, r4, 0
-	cmp r4, 0
-	beq _080696B6
-	movs r0, 0
-	ldrsb r0, [r4, r0]
-	adds r0, r6, r0
-	movs r1, 0x1
-	ldrsb r1, [r4, r1]
-	adds r1, r7, r1
-	ldrh r2, [r4, 0x2]
-	bl MapGridSetMetatileIdAt
-	mov r0, r8
-	cmp r0, 0
-	beq _0806968E
-	movs r0, 0
-	ldrsb r0, [r4, r0]
-	adds r0, r6, r0
-	movs r1, 0x1
-	ldrsb r1, [r4, r1]
-	adds r1, r7, r1
-	bl CurrentMapDrawMetatileAt
-_0806968E:
-	movs r0, 0x4
-	ldrsb r0, [r5, r0]
-	adds r0, r6, r0
-	movs r1, 0x5
-	ldrsb r1, [r5, r1]
-	adds r1, r7, r1
-	ldrh r2, [r5, 0x6]
-	bl MapGridSetMetatileIdAt
-	mov r0, r8
-	cmp r0, 0
-	beq _080696B6
-	movs r0, 0x4
-	ldrsb r0, [r5, r0]
-	adds r0, r6, r0
-	movs r1, 0x5
-	ldrsb r1, [r5, r1]
-	adds r1, r7, r1
-	bl CurrentMapDrawMetatileAt
-_080696B6:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8069638
-
-	thumb_func_start sub_80696C0
-sub_80696C0: @ 80696C0
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	adds r3, r2, 0
-	ldr r0, _080696E0 @ =gUnknown_08376384
-	lsls r4, 16
-	asrs r4, 16
-	lsls r5, 16
-	asrs r5, 16
-	adds r1, r4, 0
-	adds r2, r5, 0
-	bl sub_8069638
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080696E0: .4byte gUnknown_08376384
-	thumb_func_end sub_80696C0
-
-	thumb_func_start sub_80696E4
-sub_80696E4: @ 80696E4
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	adds r3, r2, 0
-	ldr r0, _08069704 @ =gUnknown_083763A4
-	lsls r4, 16
-	asrs r4, 16
-	lsls r5, 16
-	asrs r5, 16
-	adds r1, r4, 0
-	adds r2, r5, 0
-	bl sub_8069638
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08069704: .4byte gUnknown_083763A4
-	thumb_func_end sub_80696E4
-
-	thumb_func_start sub_8069708
-sub_8069708: @ 8069708
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	adds r3, r2, 0
-	ldr r0, _08069728 @ =gUnknown_083763C4
-	lsls r4, 16
-	asrs r4, 16
-	lsls r5, 16
-	asrs r5, 16
-	adds r1, r4, 0
-	adds r2, r5, 0
-	bl sub_8069638
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08069728: .4byte gUnknown_083763C4
-	thumb_func_end sub_8069708
-
 	thumb_func_start sub_806972C
 sub_806972C: @ 806972C
 	push {r4-r7,lr}
diff --git a/src/field_tasks.c b/src/field_tasks.c
old mode 100644
new mode 100755
index 39c2146d6..11f67c330
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -11,6 +11,8 @@
 #include "field_special_scene.h"
 #include "secret_base.h"
 #include "metatile_behavior.h"
+#include "fieldmap.h"
+#include "field_camera.h"
 #include "field_tasks.h"
 
 void DummyPerStepCallback(u8);
@@ -176,3 +178,108 @@ const struct MetatileOffset *sub_80695E0(const struct MetatileOffset a0[][2], s8
         return NULL;
     }
 }
+
+#ifdef NONMATCHING
+void sub_8069638(const struct MetatileOffset offsets[][2], s16 x, s16 y, bool32 flag)
+{
+    const struct MetatileOffset *offsetData = sub_80695E0(offsets, MapGridGetMetatileBehaviorAt(x, y));
+    const struct MetatileOffset *offsetData2 = offsetData;
+    if (offsetData != NULL)
+    {
+        MapGridSetMetatileIdAt(x + offsetData[0].x, y + offsetData[0].y, offsetData[0].tileId);
+        if (flag)
+        {
+            CurrentMapDrawMetatileAt(x + offsetData[0].x, y + offsetData[0].y);
+        }
+        MapGridSetMetatileIdAt(x + offsetData2[1].x, y + offsetData2[1].y, offsetData2[1].tileId);
+        if (flag)
+        {
+            CurrentMapDrawMetatileAt(x + offsetData2[1].x, y + offsetData2[1].y);
+        }
+    }
+}
+#else
+__attribute__((naked))
+void sub_8069638(const struct MetatileOffset offsets[][2], s16 x, s16 y, bool32 flag)
+{
+    asm_unified("\tpush {r4-r7,lr}\n"
+                    "\tmov r7, r8\n"
+                    "\tpush {r7}\n"
+                    "\tadds r5, r0, 0\n"
+                    "\tmov r8, r3\n"
+                    "\tlsls r1, 16\n"
+                    "\tasrs r6, r1, 16\n"
+                    "\tlsls r2, 16\n"
+                    "\tasrs r7, r2, 16\n"
+                    "\tadds r0, r6, 0\n"
+                    "\tadds r1, r7, 0\n"
+                    "\tbl MapGridGetMetatileBehaviorAt\n"
+                    "\tadds r1, r0, 0\n"
+                    "\tlsls r1, 16\n"
+                    "\tlsrs r1, 16\n"
+                    "\tadds r0, r5, 0\n"
+                    "\tbl sub_80695E0\n"
+                    "\tadds r4, r0, 0\n"
+                    "\tadds r5, r4, 0\n"
+                    "\tcmp r4, 0\n"
+                    "\tbeq _080696B6\n"
+                    "\tmovs r0, 0\n"
+                    "\tldrsb r0, [r4, r0]\n"
+                    "\tadds r0, r6, r0\n"
+                    "\tmovs r1, 0x1\n"
+                    "\tldrsb r1, [r4, r1]\n"
+                    "\tadds r1, r7, r1\n"
+                    "\tldrh r2, [r4, 0x2]\n"
+                    "\tbl MapGridSetMetatileIdAt\n"
+                    "\tmov r0, r8\n"
+                    "\tcmp r0, 0\n"
+                    "\tbeq _0806968E\n"
+                    "\tmovs r0, 0\n"
+                    "\tldrsb r0, [r4, r0]\n"
+                    "\tadds r0, r6, r0\n"
+                    "\tmovs r1, 0x1\n"
+                    "\tldrsb r1, [r4, r1]\n"
+                    "\tadds r1, r7, r1\n"
+                    "\tbl CurrentMapDrawMetatileAt\n"
+                    "_0806968E:\n"
+                    "\tmovs r0, 0x4\n"
+                    "\tldrsb r0, [r5, r0]\n"
+                    "\tadds r0, r6, r0\n"
+                    "\tmovs r1, 0x5\n"
+                    "\tldrsb r1, [r5, r1]\n"
+                    "\tadds r1, r7, r1\n"
+                    "\tldrh r2, [r5, 0x6]\n"
+                    "\tbl MapGridSetMetatileIdAt\n"
+                    "\tmov r0, r8\n"
+                    "\tcmp r0, 0\n"
+                    "\tbeq _080696B6\n"
+                    "\tmovs r0, 0x4\n"
+                    "\tldrsb r0, [r5, r0]\n"
+                    "\tadds r0, r6, r0\n"
+                    "\tmovs r1, 0x5\n"
+                    "\tldrsb r1, [r5, r1]\n"
+                    "\tadds r1, r7, r1\n"
+                    "\tbl CurrentMapDrawMetatileAt\n"
+                    "_080696B6:\n"
+                    "\tpop {r3}\n"
+                    "\tmov r8, r3\n"
+                    "\tpop {r4-r7}\n"
+                    "\tpop {r0}\n"
+                    "\tbx r0");
+}
+#endif
+
+void sub_80696C0(s16 x, s16 y, bool32 flag)
+{
+    sub_8069638(gUnknown_08376384, x, y, flag);
+}
+
+void sub_80696E4(s16 x, s16 y, bool32 flag)
+{
+    sub_8069638(gUnknown_083763A4, x, y, flag);
+}
+
+void sub_8069708(s16 x, s16 y, bool32 flag)
+{
+    sub_8069638(gUnknown_083763C4, x, y, flag);
+}
-- 
cgit v1.2.3


From d7ab13d3a9b969b0267786e566595689338ae7c4 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 26 Jun 2017 08:35:22 -0400
Subject: sub_806972C

---
 asm/field_tasks.s | 82 -------------------------------------------------------
 src/field_tasks.c | 34 +++++++++++++++++++++++
 2 files changed, 34 insertions(+), 82 deletions(-)

diff --git a/asm/field_tasks.s b/asm/field_tasks.s
index 0cccd07ba..dcc3858ee 100755
--- a/asm/field_tasks.s
+++ b/asm/field_tasks.s
@@ -6,88 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_806972C
-sub_806972C: @ 806972C
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	lsls r0, 16
-	lsrs r0, 16
-	mov r8, r0
-	mov r10, r8
-	lsls r1, 16
-	lsrs r7, r1, 16
-	mov r9, r7
-	lsls r2, 16
-	asrs r6, r2, 16
-	lsls r3, 16
-	asrs r5, r3, 16
-	adds r0, r6, 0
-	adds r1, r5, 0
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r4, r0, 24
-	adds r0, r4, 0
-	bl sub_80576A0
-	lsls r0, 24
-	cmp r0, 0
-	beq _08069770
-	lsls r0, r7, 16
-	asrs r0, 16
-	cmp r0, r5
-	ble _080697B6
-_0806976C:
-	movs r0, 0
-	b _080697B8
-_08069770:
-	adds r0, r4, 0
-	bl sub_80576B4
-	lsls r0, 24
-	cmp r0, 0
-	beq _08069788
-	mov r1, r9
-	lsls r0, r1, 16
-	asrs r0, 16
-	cmp r0, r5
-	bge _080697B6
-	b _0806976C
-_08069788:
-	adds r0, r4, 0
-	bl sub_80576C8
-	lsls r0, 24
-	cmp r0, 0
-	beq _080697A0
-	mov r1, r8
-	lsls r0, r1, 16
-	asrs r0, 16
-	cmp r0, r6
-	ble _080697B6
-	b _0806976C
-_080697A0:
-	adds r0, r4, 0
-	bl sub_80576DC
-	lsls r0, 24
-	cmp r0, 0
-	beq _080697B6
-	mov r1, r10
-	lsls r0, r1, 16
-	asrs r0, 16
-	cmp r0, r6
-	blt _0806976C
-_080697B6:
-	movs r0, 0x1
-_080697B8:
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_806972C
-
 	thumb_func_start sub_80697C8
 sub_80697C8: @ 80697C8
 	push {r4-r7,lr}
diff --git a/src/field_tasks.c b/src/field_tasks.c
index 11f67c330..6682d01c3 100755
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -283,3 +283,37 @@ void sub_8069708(s16 x, s16 y, bool32 flag)
 {
     sub_8069638(gUnknown_083763C4, x, y, flag);
 }
+
+bool8 sub_806972C(s16 x1, s16 y1, s16 x2, s16 y2)
+{
+    s8 metatileBehavior = MapGridGetMetatileBehaviorAt(x2, y2);
+    if (sub_80576A0(metatileBehavior))
+    {
+        if (y1 > y2)
+        {
+            return FALSE;
+        }
+    }
+    else if (sub_80576B4(metatileBehavior))
+    {
+        if (y1 < y2)
+        {
+            return FALSE;
+        }
+    }
+    else if (sub_80576C8(metatileBehavior))
+    {
+        if (x1 > x2)
+        {
+            return FALSE;
+        }
+    }
+    else if (sub_80576DC(metatileBehavior))
+    {
+        if (x1 < x2)
+        {
+            return FALSE;
+        }
+    }
+    return TRUE;
+}
-- 
cgit v1.2.3


From 155007d14989b2a798a15c6be8a00bb926d2c9b7 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 26 Jun 2017 08:37:30 -0400
Subject: sub_80697C8

---
 asm/field_tasks.s | 82 -------------------------------------------------------
 src/field_tasks.c | 34 +++++++++++++++++++++++
 2 files changed, 34 insertions(+), 82 deletions(-)

diff --git a/asm/field_tasks.s b/asm/field_tasks.s
index dcc3858ee..6a7176104 100755
--- a/asm/field_tasks.s
+++ b/asm/field_tasks.s
@@ -6,88 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_80697C8
-sub_80697C8: @ 80697C8
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	lsls r2, 16
-	lsrs r2, 16
-	mov r8, r2
-	mov r10, r8
-	lsls r3, 16
-	lsrs r7, r3, 16
-	mov r9, r7
-	lsls r0, 16
-	asrs r6, r0, 16
-	lsls r1, 16
-	asrs r5, r1, 16
-	adds r0, r6, 0
-	adds r1, r5, 0
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r4, r0, 24
-	adds r0, r4, 0
-	bl sub_80576A0
-	lsls r0, 24
-	cmp r0, 0
-	beq _0806980C
-	lsls r0, r7, 16
-	asrs r0, 16
-	cmp r5, r0
-	bge _08069852
-_08069808:
-	movs r0, 0
-	b _08069854
-_0806980C:
-	adds r0, r4, 0
-	bl sub_80576B4
-	lsls r0, 24
-	cmp r0, 0
-	beq _08069824
-	mov r1, r9
-	lsls r0, r1, 16
-	asrs r0, 16
-	cmp r5, r0
-	ble _08069852
-	b _08069808
-_08069824:
-	adds r0, r4, 0
-	bl sub_80576C8
-	lsls r0, 24
-	cmp r0, 0
-	beq _0806983C
-	mov r1, r8
-	lsls r0, r1, 16
-	asrs r0, 16
-	cmp r6, r0
-	bge _08069852
-	b _08069808
-_0806983C:
-	adds r0, r4, 0
-	bl sub_80576DC
-	lsls r0, 24
-	cmp r0, 0
-	beq _08069852
-	mov r1, r10
-	lsls r0, r1, 16
-	asrs r0, 16
-	cmp r6, r0
-	bgt _08069808
-_08069852:
-	movs r0, 0x1
-_08069854:
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80697C8
-
 	thumb_func_start PerStepCallback_8069864
 PerStepCallback_8069864: @ 8069864
 	push {r4-r7,lr}
diff --git a/src/field_tasks.c b/src/field_tasks.c
index 6682d01c3..34cbc9796 100755
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -317,3 +317,37 @@ bool8 sub_806972C(s16 x1, s16 y1, s16 x2, s16 y2)
     }
     return TRUE;
 }
+
+bool8 sub_80697C8(s16 x1, s16 y1, s16 x2, s16 y2)
+{
+    s8 metatileBehavior = MapGridGetMetatileBehaviorAt(x1, y1);
+    if (sub_80576A0(metatileBehavior))
+    {
+        if (y1 < y2)
+        {
+            return FALSE;
+        }
+    }
+    else if (sub_80576B4(metatileBehavior))
+    {
+        if (y1 > y2)
+        {
+            return FALSE;
+        }
+    }
+    else if (sub_80576C8(metatileBehavior))
+    {
+        if (x1 < x2)
+        {
+            return FALSE;
+        }
+    }
+    else if (sub_80576DC(metatileBehavior))
+    {
+        if (x1 > x2)
+        {
+            return FALSE;
+        }
+    }
+    return TRUE;
+}
-- 
cgit v1.2.3


From 830b3a9e1f58133e4b4d1fa6a9e65600bccd4b86 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 26 Jun 2017 18:11:50 -0400
Subject: Nonmatching WIP PerStepCallback_8069864

---
 asm/field_tasks.s | 186 ------------------------------------------------------
 src/field_tasks.c |  60 ++++++++++++++++++
 2 files changed, 60 insertions(+), 186 deletions(-)

diff --git a/asm/field_tasks.s b/asm/field_tasks.s
index 6a7176104..5b6e5a81d 100755
--- a/asm/field_tasks.s
+++ b/asm/field_tasks.s
@@ -6,192 +6,6 @@
 
 	.text
 
-	thumb_func_start PerStepCallback_8069864
-PerStepCallback_8069864: @ 8069864
-	push {r4-r7,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, _08069898 @ =gTasks + 0x8
-	adds r4, r1, r0
-	mov r5, sp
-	adds r5, 0x2
-	mov r0, sp
-	adds r1, r5, 0
-	bl PlayerGetDestCoords
-	movs r1, 0x2
-	ldrsh r0, [r4, r1]
-	adds r6, r5, 0
-	cmp r0, 0x1
-	beq _080698BE
-	cmp r0, 0x1
-	bgt _0806989C
-	cmp r0, 0
-	beq _080698A2
-	b _080699CE
-	.align 2, 0
-_08069898: .4byte gTasks + 0x8
-_0806989C:
-	cmp r0, 0x2
-	beq _0806998C
-	b _080699CE
-_080698A2:
-	mov r0, sp
-	ldrh r0, [r0]
-	strh r0, [r4, 0x4]
-	ldrh r0, [r5]
-	strh r0, [r4, 0x6]
-	mov r0, sp
-	movs r2, 0
-	ldrsh r0, [r0, r2]
-	movs r3, 0
-	ldrsh r1, [r5, r3]
-	movs r2, 0x1
-	bl sub_80696E4
-	b _080699CA
-_080698BE:
-	mov r0, sp
-	movs r7, 0
-	ldrsh r1, [r0, r7]
-	movs r2, 0x4
-	ldrsh r0, [r4, r2]
-	cmp r1, r0
-	bne _080698D8
-	movs r3, 0
-	ldrsh r1, [r5, r3]
-	movs r7, 0x6
-	ldrsh r0, [r4, r7]
-	cmp r1, r0
-	beq _080699CE
-_080698D8:
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	movs r2, 0
-	ldrsh r1, [r5, r2]
-	movs r3, 0x4
-	ldrsh r2, [r4, r3]
-	movs r5, 0x6
-	ldrsh r3, [r4, r5]
-	bl sub_806972C
-	cmp r0, 0
-	beq _08069920
-	movs r7, 0x4
-	ldrsh r0, [r4, r7]
-	movs r2, 0x6
-	ldrsh r1, [r4, r2]
-	movs r2, 0x1
-	bl sub_80696C0
-	movs r3, 0x4
-	ldrsh r0, [r4, r3]
-	movs r5, 0x6
-	ldrsh r1, [r4, r5]
-	movs r2, 0
-	bl sub_8069708
-	ldrh r0, [r4, 0x4]
-	strh r0, [r4, 0x8]
-	ldrh r0, [r4, 0x6]
-	strh r0, [r4, 0xA]
-	movs r0, 0x2
-	strh r0, [r4, 0x2]
-	movs r0, 0x8
-	strh r0, [r4, 0xC]
-	b _0806992A
-_08069920:
-	movs r7, 0x1
-	negs r7, r7
-	adds r0, r7, 0
-	strh r0, [r4, 0x8]
-	strh r0, [r4, 0xA]
-_0806992A:
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	adds r5, r6, 0
-	movs r2, 0
-	ldrsh r1, [r5, r2]
-	movs r3, 0x4
-	ldrsh r2, [r4, r3]
-	movs r7, 0x6
-	ldrsh r3, [r4, r7]
-	bl sub_80697C8
-	cmp r0, 0
-	beq _0806995E
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	movs r2, 0
-	ldrsh r1, [r5, r2]
-	movs r2, 0x1
-	bl sub_80696C0
-	movs r0, 0x2
-	strh r0, [r4, 0x2]
-	movs r0, 0x8
-	strh r0, [r4, 0xC]
-_0806995E:
-	mov r0, sp
-	ldrh r0, [r0]
-	strh r0, [r4, 0x4]
-	ldrh r0, [r6]
-	strh r0, [r4, 0x6]
-	mov r0, sp
-	movs r3, 0
-	ldrsh r0, [r0, r3]
-	movs r5, 0
-	ldrsh r1, [r6, r5]
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl MetatileBehavior_IsPacifidlogLog
-	lsls r0, 24
-	cmp r0, 0
-	beq _080699CE
-	movs r0, 0x46
-	bl PlaySE
-	b _080699CE
-_0806998C:
-	ldrh r0, [r4, 0xC]
-	subs r0, 0x1
-	strh r0, [r4, 0xC]
-	lsls r0, 16
-	cmp r0, 0
-	bne _080699CE
-	mov r0, sp
-	movs r7, 0
-	ldrsh r0, [r0, r7]
-	movs r2, 0
-	ldrsh r1, [r5, r2]
-	movs r2, 0x1
-	bl sub_80696E4
-	movs r3, 0x8
-	ldrsh r0, [r4, r3]
-	movs r1, 0x1
-	negs r1, r1
-	cmp r0, r1
-	beq _080699CA
-	movs r5, 0xA
-	ldrsh r0, [r4, r5]
-	cmp r0, r1
-	beq _080699CA
-	movs r7, 0x8
-	ldrsh r0, [r4, r7]
-	movs r2, 0xA
-	ldrsh r1, [r4, r2]
-	movs r2, 0x1
-	bl sub_8069708
-_080699CA:
-	movs r0, 0x1
-	strh r0, [r4, 0x2]
-_080699CE:
-	add sp, 0x4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end PerStepCallback_8069864
-
 	thumb_func_start sub_80699D8
 sub_80699D8: @ 80699D8
 	push {r4,r5,lr}
diff --git a/src/field_tasks.c b/src/field_tasks.c
index 34cbc9796..407fa7776 100755
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -12,7 +12,10 @@
 #include "secret_base.h"
 #include "metatile_behavior.h"
 #include "fieldmap.h"
+#include "field_player_avatar.h"
 #include "field_camera.h"
+#include "songs.h"
+#include "sound.h"
 #include "field_tasks.h"
 
 void DummyPerStepCallback(u8);
@@ -351,3 +354,60 @@ bool8 sub_80697C8(s16 x1, s16 y1, s16 x2, s16 y2)
     }
     return TRUE;
 }
+
+void PerStepCallback_8069864(u8 taskId)
+{
+    s16 x, y;
+    s16 *data = gTasks[taskId].data;
+    PlayerGetDestCoords(&x, &y);
+    switch (data[1])
+    {
+        case 0:
+            data[2] = x;
+            data[3] = y;
+            sub_80696E4(x, y, TRUE);
+            data[1] = 1;
+            break;
+        case 1:
+            if (x != data[2] || y != data[3])
+            {
+                if (sub_806972C(x, y, data[2], data[3]))
+                {
+                    sub_80696C0(data[2], data[3], TRUE);
+                    sub_8069708(data[2], data[3], FALSE);
+                    data[4] = data[2];
+                    data[5] = data[3];
+                    data[1] = 2;
+                    data[6] = 8;
+                }
+                else
+                {
+                    data[4] = -1;
+                    data[5] = -1;
+                }
+                if (sub_80697C8(x, y, data[2], data[3]))
+                {
+                    sub_80696C0(x, y, TRUE);
+                    data[1] = 2;
+                    data[6] = 8;
+                }
+                data[2] = x;
+                data[3] = y;
+                if (MetatileBehavior_IsPacifidlogLog(MapGridGetMetatileBehaviorAt(x, y)))
+                {
+                    PlaySE(SE_MIZU);
+                }
+                break;
+            }
+        case 2:
+            if ((--data[6]) == 0)
+            {
+                sub_80696E4(x, y, TRUE);
+                if (data[4] != -1 && data[5] != -1)
+                {
+                    sub_8069708(data[4], data[5], TRUE);
+                }
+                data[1] = 1;
+            }
+    }
+}
-- 
cgit v1.2.3


From 826d62b737f8012dbd5865098ac84c94cedd5139 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 26 Jun 2017 19:50:49 -0400
Subject: Matching PerStepCallback_8069864

---
 src/field_tasks.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/field_tasks.c b/src/field_tasks.c
index 407fa7776..a266f8c8b 100755
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -287,7 +287,7 @@ void sub_8069708(s16 x, s16 y, bool32 flag)
     sub_8069638(gUnknown_083763C4, x, y, flag);
 }
 
-bool8 sub_806972C(s16 x1, s16 y1, s16 x2, s16 y2)
+bool32 sub_806972C(s16 x1, s16 y1, s16 x2, s16 y2)
 {
     s8 metatileBehavior = MapGridGetMetatileBehaviorAt(x2, y2);
     if (sub_80576A0(metatileBehavior))
@@ -321,7 +321,7 @@ bool8 sub_806972C(s16 x1, s16 y1, s16 x2, s16 y2)
     return TRUE;
 }
 
-bool8 sub_80697C8(s16 x1, s16 y1, s16 x2, s16 y2)
+bool32 sub_80697C8(s16 x1, s16 y1, s16 x2, s16 y2)
 {
     s8 metatileBehavior = MapGridGetMetatileBehaviorAt(x1, y1);
     if (sub_80576A0(metatileBehavior))
@@ -357,8 +357,9 @@ bool8 sub_80697C8(s16 x1, s16 y1, s16 x2, s16 y2)
 
 void PerStepCallback_8069864(u8 taskId)
 {
+    s16 *data;
     s16 x, y;
-    s16 *data = gTasks[taskId].data;
+    data = gTasks[taskId].data;
     PlayerGetDestCoords(&x, &y);
     switch (data[1])
     {
@@ -397,8 +398,8 @@ void PerStepCallback_8069864(u8 taskId)
                 {
                     PlaySE(SE_MIZU);
                 }
-                break;
             }
+            break;
         case 2:
             if ((--data[6]) == 0)
             {
@@ -409,5 +410,6 @@ void PerStepCallback_8069864(u8 taskId)
                 }
                 data[1] = 1;
             }
+            break;
     }
 }
-- 
cgit v1.2.3


From c739404ef0f50f87f580d8454ae9c32325ce83e4 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 26 Jun 2017 20:35:57 -0400
Subject: Through PerStepCallback_8069AA0

---
 asm/field_tasks.s | 363 ------------------------------------------------------
 src/field_tasks.c | 122 ++++++++++++++++++
 2 files changed, 122 insertions(+), 363 deletions(-)

diff --git a/asm/field_tasks.s b/asm/field_tasks.s
index 5b6e5a81d..547a43668 100755
--- a/asm/field_tasks.s
+++ b/asm/field_tasks.s
@@ -6,369 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_80699D8
-sub_80699D8: @ 80699D8
-	push {r4,r5,lr}
-	lsls r0, 16
-	lsrs r4, r0, 16
-	lsls r1, 16
-	lsrs r5, r1, 16
-	bl PlayerGetZCoord
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x1
-	ands r0, r1
-	cmp r0, 0
-	bne _08069A32
-	lsls r0, r4, 16
-	asrs r4, r0, 16
-	lsls r0, r5, 16
-	asrs r5, r0, 16
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl MapGridGetMetatileIdAt
-	adds r1, r0, 0
-	ldr r0, _08069A14 @ =0x0000024e
-	cmp r1, r0
-	beq _08069A18
-	adds r0, 0x8
-	cmp r1, r0
-	beq _08069A28
-	b _08069A32
-	.align 2, 0
-_08069A14: .4byte 0x0000024e
-_08069A18:
-	ldr r2, _08069A24 @ =0x0000024f
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl MapGridSetMetatileIdAt
-	b _08069A32
-	.align 2, 0
-_08069A24: .4byte 0x0000024f
-_08069A28:
-	ldr r2, _08069A38 @ =0x00000257
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl MapGridSetMetatileIdAt
-_08069A32:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08069A38: .4byte 0x00000257
-	thumb_func_end sub_80699D8
-
-	thumb_func_start sub_8069A3C
-sub_8069A3C: @ 8069A3C
-	push {r4,r5,lr}
-	lsls r0, 16
-	lsrs r4, r0, 16
-	lsls r1, 16
-	lsrs r5, r1, 16
-	bl PlayerGetZCoord
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x1
-	ands r0, r1
-	cmp r0, 0
-	bne _08069A96
-	lsls r0, r4, 16
-	asrs r4, r0, 16
-	lsls r0, r5, 16
-	asrs r5, r0, 16
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl MapGridGetMetatileIdAt
-	adds r1, r0, 0
-	ldr r0, _08069A78 @ =0x0000024f
-	cmp r1, r0
-	beq _08069A7C
-	adds r0, 0x8
-	cmp r1, r0
-	beq _08069A8C
-	b _08069A96
-	.align 2, 0
-_08069A78: .4byte 0x0000024f
-_08069A7C:
-	ldr r2, _08069A88 @ =0x0000024e
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl MapGridSetMetatileIdAt
-	b _08069A96
-	.align 2, 0
-_08069A88: .4byte 0x0000024e
-_08069A8C:
-	ldr r2, _08069A9C @ =0x00000256
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl MapGridSetMetatileIdAt
-_08069A96:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08069A9C: .4byte 0x00000256
-	thumb_func_end sub_8069A3C
-
-	thumb_func_start PerStepCallback_8069AA0
-PerStepCallback_8069AA0: @ 8069AA0
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x8
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, _08069ADC @ =gTasks + 0x8
-	adds r6, r1, r0
-	mov r4, sp
-	adds r4, 0x2
-	mov r0, sp
-	adds r1, r4, 0
-	bl PlayerGetDestCoords
-	movs r0, 0x2
-	ldrsh r5, [r6, r0]
-	mov r9, r4
-	cmp r5, 0x1
-	beq _08069B34
-	cmp r5, 0x1
-	bgt _08069AE0
-	cmp r5, 0
-	beq _08069AE8
-	b _08069CA6
-	.align 2, 0
-_08069ADC: .4byte gTasks + 0x8
-_08069AE0:
-	cmp r5, 0x2
-	bne _08069AE6
-	b _08069C14
-_08069AE6:
-	b _08069CA6
-_08069AE8:
-	mov r0, sp
-	ldrh r0, [r0]
-	strh r0, [r6, 0x4]
-	mov r1, r9
-	ldrh r0, [r1]
-	strh r0, [r6, 0x6]
-	mov r0, sp
-	movs r2, 0
-	ldrsh r0, [r0, r2]
-	movs r3, 0
-	ldrsh r1, [r1, r3]
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl MetatileBehavior_IsFortreeBridge
-	lsls r0, 24
-	cmp r0, 0
-	bne _08069B12
-	b _08069CA2
-_08069B12:
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	mov r2, r9
-	movs r3, 0
-	ldrsh r1, [r2, r3]
-	bl sub_80699D8
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	mov r2, r9
-	movs r3, 0
-	ldrsh r1, [r2, r3]
-	bl CurrentMapDrawMetatileAt
-	b _08069CA2
-_08069B34:
-	ldrh r0, [r6, 0x6]
-	mov r8, r0
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	ldrh r2, [r6, 0x4]
-	mov r10, r2
-	movs r3, 0x4
-	ldrsh r7, [r6, r3]
-	cmp r0, r7
-	bne _08069B5C
-	mov r0, r9
-	movs r2, 0
-	ldrsh r1, [r0, r2]
-	mov r3, r8
-	lsls r0, r3, 16
-	asrs r0, 16
-	cmp r1, r0
-	bne _08069B5C
-	b _08069CA6
-_08069B5C:
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	mov r2, r9
-	movs r3, 0
-	ldrsh r1, [r2, r3]
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl MetatileBehavior_IsFortreeBridge
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [sp, 0x4]
-	mov r0, r8
-	lsls r4, r0, 16
-	asrs r1, r4, 16
-	adds r0, r7, 0
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl MetatileBehavior_IsFortreeBridge
-	lsls r0, 24
-	lsrs r7, r0, 24
-	bl PlayerGetZCoord
-	movs r1, 0
-	ands r5, r0
-	lsls r0, r5, 24
-	adds r5, r4, 0
-	cmp r0, 0
-	bne _08069BA4
-	movs r1, 0x1
-_08069BA4:
-	cmp r1, 0
-	beq _08069BB8
-	ldr r1, [sp, 0x4]
-	cmp r1, 0x1
-	beq _08069BB2
-	cmp r7, 0x1
-	bne _08069BB8
-_08069BB2:
-	movs r0, 0x47
-	bl PlaySE
-_08069BB8:
-	cmp r7, 0
-	beq _08069BF4
-	mov r2, r10
-	lsls r4, r2, 16
-	asrs r4, 16
-	asrs r5, 16
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl sub_8069A3C
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl CurrentMapDrawMetatileAt
-	mov r0, sp
-	movs r3, 0
-	ldrsh r0, [r0, r3]
-	mov r2, r9
-	movs r3, 0
-	ldrsh r1, [r2, r3]
-	bl sub_80699D8
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	mov r2, r9
-	movs r3, 0
-	ldrsh r1, [r2, r3]
-	bl CurrentMapDrawMetatileAt
-_08069BF4:
-	mov r0, r10
-	strh r0, [r6, 0x8]
-	mov r1, r8
-	strh r1, [r6, 0xA]
-	mov r0, sp
-	ldrh r0, [r0]
-	strh r0, [r6, 0x4]
-	mov r2, r9
-	ldrh r0, [r2]
-	strh r0, [r6, 0x6]
-	cmp r7, 0
-	beq _08069CA6
-	movs r0, 0x10
-	strh r0, [r6, 0xC]
-	movs r0, 0x2
-	strh r0, [r6, 0x2]
-_08069C14:
-	ldrh r0, [r6, 0xC]
-	subs r0, 0x1
-	strh r0, [r6, 0xC]
-	ldrh r3, [r6, 0x8]
-	mov r10, r3
-	ldrh r0, [r6, 0xA]
-	mov r8, r0
-	movs r1, 0xC
-	ldrsh r0, [r6, r1]
-	movs r1, 0x7
-	bl __modsi3
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x7
-	bhi _08069C9A
-	lsls r0, 2
-	ldr r1, _08069C40 @ =_08069C44
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08069C40: .4byte _08069C44
-	.align 2, 0
-_08069C44:
-	.4byte _08069C64
-	.4byte _08069C9A
-	.4byte _08069C9A
-	.4byte _08069C9A
-	.4byte _08069C76
-	.4byte _08069C9A
-	.4byte _08069C9A
-	.4byte _08069C9A
-_08069C64:
-	mov r2, r10
-	lsls r0, r2, 16
-	asrs r0, 16
-	mov r3, r8
-	lsls r1, r3, 16
-	asrs r1, 16
-	bl CurrentMapDrawMetatileAt
-	b _08069C9A
-_08069C76:
-	mov r0, r10
-	lsls r5, r0, 16
-	asrs r5, 16
-	mov r1, r8
-	lsls r4, r1, 16
-	asrs r4, 16
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl sub_80699D8
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl CurrentMapDrawMetatileAt
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl sub_8069A3C
-_08069C9A:
-	movs r2, 0xC
-	ldrsh r0, [r6, r2]
-	cmp r0, 0
-	bne _08069CA6
-_08069CA2:
-	movs r0, 0x1
-	strh r0, [r6, 0x2]
-_08069CA6:
-	add sp, 0x8
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end PerStepCallback_8069AA0
-
 	thumb_func_start sub_8069CB8
 sub_8069CB8: @ 8069CB8
 	push {lr}
diff --git a/src/field_tasks.c b/src/field_tasks.c
index a266f8c8b..5ccd3fa14 100755
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -413,3 +413,125 @@ void PerStepCallback_8069864(u8 taskId)
             break;
     }
 }
+
+void sub_80699D8(s16 x, s16 y)
+{
+    u8 z = PlayerGetZCoord();
+    if (!(z & 0x01))
+    {
+        switch (MapGridGetMetatileIdAt(x, y))
+        {
+            case 0x24e:
+                MapGridSetMetatileIdAt(x, y, 0x24f);
+                break;
+            case 0x256:
+                MapGridSetMetatileIdAt(x, y, 0x257);
+                break;
+        }
+    }
+}
+
+void sub_8069A3C(s16 x, s16 y)
+{
+    u8 z = PlayerGetZCoord();
+    if (!(z & 0x01))
+    {
+        switch (MapGridGetMetatileIdAt(x, y))
+        {
+            case 0x24f:
+                MapGridSetMetatileIdAt(x, y, 0x24e);
+                break;
+            case 0x257:
+                MapGridSetMetatileIdAt(x, y, 0x256);
+                break;
+        }
+    }
+}
+
+void PerStepCallback_8069AA0(u8 taskId)
+{
+    bool8 isFortreeBridgeCur;
+    bool8 isFortreeBridgePrev;
+    u8 z, flag;
+    s16 x, y, x2, y2;
+    s16 *data = gTasks[taskId].data;
+    PlayerGetDestCoords(&x, &y);
+    switch (data[1])
+    {
+        default:
+            break;
+        case 0:
+            data[2] = x;
+            data[3] = y;
+            if (MetatileBehavior_IsFortreeBridge(MapGridGetMetatileBehaviorAt(x, y)))
+            {
+                sub_80699D8(x, y);
+                CurrentMapDrawMetatileAt(x, y);
+            }
+            data[1] = 1;
+            break;
+        case 1:
+            x2 = data[2];
+            y2 = data[3];
+            if (x == x2 && y == y2)
+            {
+                break;
+            }
+            isFortreeBridgeCur = MetatileBehavior_IsFortreeBridge(MapGridGetMetatileBehaviorAt(x, y));
+            isFortreeBridgePrev = MetatileBehavior_IsFortreeBridge(MapGridGetMetatileBehaviorAt(x2, y2));
+            z = PlayerGetZCoord();
+            flag = 0;
+            if ((u8)(z & 1) == 0)
+            {
+                flag = 1;
+            }
+            if (flag && (isFortreeBridgeCur == 1 || isFortreeBridgePrev == 1))
+            {
+                PlaySE(SE_HASHI);
+            }
+            if (isFortreeBridgePrev)
+            {
+                sub_8069A3C(x2, y2);
+                CurrentMapDrawMetatileAt(x2, y2);
+                sub_80699D8(x, y);
+                CurrentMapDrawMetatileAt(x, y);
+            }
+            data[4] = x2;
+            data[5] = y2;
+            data[2] = x;
+            data[3] = y;
+            if (!isFortreeBridgePrev)
+            {
+                break;
+            }
+            data[6] = 16;
+            data[1] = 2;
+            // fallthrough
+        case 2:
+            data[6]--;
+            x2 = data[4];
+            y2 = data[5];
+            switch (data[6] % 7)
+            {
+                case 0:
+                    CurrentMapDrawMetatileAt(x2, y2);
+                case 1:
+                case 2:
+                case 3:
+                    break;
+                case 4:
+                    sub_80699D8(x2, y2);
+                    CurrentMapDrawMetatileAt(x2, y2);
+                    sub_8069A3C(x2, y2);
+                case 5:
+                case 6:
+                case 7:
+                    break;
+            }
+            if (data[6] == 0)
+            {
+                data[1] = 1;
+            }
+            break;
+    }
+}
-- 
cgit v1.2.3


From 10f782959283e43cea5219033772778dbaf4a745 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 26 Jun 2017 20:42:50 -0400
Subject: sub_8069CB8

---
 asm/field_tasks.s  | 37 -------------------------------------
 data/field_tasks.s | 30 ------------------------------
 src/field_tasks.c  | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 67 deletions(-)
 mode change 100644 => 100755 data/field_tasks.s

diff --git a/asm/field_tasks.s b/asm/field_tasks.s
index 547a43668..83e0a8371 100755
--- a/asm/field_tasks.s
+++ b/asm/field_tasks.s
@@ -6,43 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_8069CB8
-sub_8069CB8: @ 8069CB8
-	push {lr}
-	lsls r1, 16
-	lsrs r1, 16
-	lsls r0, 16
-	ldr r2, _08069CE8 @ =0xfffd0000
-	adds r0, r2
-	lsrs r0, 16
-	cmp r0, 0xA
-	bhi _08069CF4
-	lsls r0, r1, 16
-	asrs r1, r0, 16
-	ldr r2, _08069CEC @ =0xfffa0000
-	adds r0, r2
-	lsrs r0, 16
-	cmp r0, 0xD
-	bhi _08069CF4
-	ldr r0, _08069CF0 @ =gUnknown_083763E4
-	lsls r1, 1
-	adds r1, r0
-	ldrh r0, [r1]
-	cmp r0, 0
-	beq _08069CF4
-	movs r0, 0x1
-	b _08069CF6
-	.align 2, 0
-_08069CE8: .4byte 0xfffd0000
-_08069CEC: .4byte 0xfffa0000
-_08069CF0: .4byte gUnknown_083763E4
-_08069CF4:
-	movs r0, 0
-_08069CF6:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8069CB8
-
 	thumb_func_start sub_8069CFC
 sub_8069CFC: @ 8069CFC
 	push {r4,r5,lr}
diff --git a/data/field_tasks.s b/data/field_tasks.s
old mode 100644
new mode 100755
index a4b78df2e..faaa12342
--- a/data/field_tasks.s
+++ b/data/field_tasks.s
@@ -3,36 +3,6 @@
 
 	.section .rodata
 
-
-	.align 1
-gUnknown_083763E4:: @ 83763E4
-	.2byte      0
-	.2byte      0
-	.2byte      0
-	.2byte      0
-	.2byte      0
-	.2byte      0
-	.2byte 0x4001
-	.2byte 0x4002
-	.2byte 0x4003
-	.2byte 0x4004
-	.2byte      0
-	.2byte      0
-	.2byte 0x4005
-	.2byte 0x4006
-	.2byte 0x4007
-	.2byte      0
-	.2byte      0
-	.2byte 0x4008
-	.2byte 0x4009
-	.2byte 0x400A
-	.2byte      0
-	.2byte      0
-	.2byte      0
-	.2byte      0
-	.2byte      0
-	.2byte      0
-
 	.align 1
 gUnknown_08376418:: @ 8376418
 	.2byte 0xE8, 0xEB, 0xEA, 0xE9
diff --git a/src/field_tasks.c b/src/field_tasks.c
index 5ccd3fa14..88dd025cc 100755
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -535,3 +535,41 @@ void PerStepCallback_8069AA0(u8 taskId)
             break;
     }
 }
+
+const u16 gUnknown_083763E4[] = {
+         0,
+         0,
+         0,
+         0,
+         0,
+         0,
+    0x4001,
+    0x4002,
+    0x4003,
+    0x4004,
+         0,
+         0,
+    0x4005,
+    0x4006,
+    0x4007,
+         0,
+         0,
+    0x4008,
+    0x4009,
+    0x400A,
+         0,
+         0,
+         0,
+         0,
+         0,
+         0
+};
+
+bool8 sub_8069CB8(s16 x, s16 y)
+{
+    if ((u16)(x - 3) < 11 && (u16)(y - 6) < 14 && gUnknown_083763E4[y])
+    {
+        return TRUE;
+    }
+    return FALSE;
+}
-- 
cgit v1.2.3


From 9cc199f064aa2f5a8e188dfe805a511c2c92c4fa Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 26 Jun 2017 21:48:30 -0400
Subject: stupid sub_8069D34

---
 asm/field_tasks.s | 69 ------------------------------------------------
 include/vars.h    |  9 +++++++
 src/field_tasks.c | 79 ++++++++++++++++++++++++++++++++++++-------------------
 3 files changed, 61 insertions(+), 96 deletions(-)
 mode change 100644 => 100755 include/vars.h

diff --git a/asm/field_tasks.s b/asm/field_tasks.s
index 83e0a8371..ab4d75609 100755
--- a/asm/field_tasks.s
+++ b/asm/field_tasks.s
@@ -6,75 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_8069CFC
-sub_8069CFC: @ 8069CFC
-	push {r4,r5,lr}
-	lsls r0, 16
-	asrs r5, r0, 16
-	lsls r1, 16
-	asrs r4, r1, 16
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl sub_8069CB8
-	cmp r0, 0
-	beq _08069D2A
-	ldr r1, _08069D30 @ =gUnknown_083763E4
-	lsls r0, r4, 1
-	adds r0, r1
-	ldrh r0, [r0]
-	bl GetVarPointer
-	subs r2, r5, 0x3
-	movs r1, 0x1
-	lsls r1, r2
-	ldrh r2, [r0]
-	orrs r1, r2
-	strh r1, [r0]
-_08069D2A:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08069D30: .4byte gUnknown_083763E4
-	thumb_func_end sub_8069CFC
-
-	thumb_func_start sub_8069D34
-sub_8069D34: @ 8069D34
-	push {r4,r5,lr}
-	lsls r0, 16
-	asrs r5, r0, 16
-	lsls r1, 16
-	asrs r4, r1, 16
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl sub_8069CB8
-	cmp r0, 0
-	beq _08069D66
-	ldr r1, _08069D6C @ =gUnknown_083763E4
-	lsls r0, r4, 1
-	adds r0, r1
-	ldrh r0, [r0]
-	bl VarGet
-	lsls r0, 16
-	subs r2, r5, 0x3
-	movs r1, 0x80
-	lsls r1, 9
-	lsls r1, r2
-	ands r1, r0
-	cmp r1, 0
-	bne _08069D70
-_08069D66:
-	movs r0, 0
-	b _08069D72
-	.align 2, 0
-_08069D6C: .4byte gUnknown_083763E4
-_08069D70:
-	movs r0, 0x1
-_08069D72:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8069D34
-
 	thumb_func_start sub_8069D78
 sub_8069D78: @ 8069D78
 	push {r4-r7,lr}
diff --git a/include/vars.h b/include/vars.h
old mode 100644
new mode 100755
index cb5bb3296..eb527ec09
--- a/include/vars.h
+++ b/include/vars.h
@@ -1,7 +1,16 @@
 #ifndef GUARD_VARS_H
 #define GUARD_VARS_H
 
+#define VAR_0x4001                 0x4001
+#define VAR_0x4002                 0x4002
 #define VAR_0x4003                 0x4003
+#define VAR_0x4004                 0x4004
+#define VAR_0x4005                 0x4005
+#define VAR_0x4006                 0x4006
+#define VAR_0x4007                 0x4007
+#define VAR_0x4008                 0x4008
+#define VAR_0x4009                 0x4009
+#define VAR_0x400A                 0x400A
 #define VAR_0x401F                 0x401F
 #define VAR_RECYCLE_GOODS          0x4020
 #define VAR_REPEL_STEP_COUNT       0x4021
diff --git a/src/field_tasks.c b/src/field_tasks.c
index 88dd025cc..92b8d3bb8 100755
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -5,6 +5,8 @@
 #include "global.h"
 #include "task.h"
 #include "main.h"
+#include "vars.h"
+#include "event_data.h"
 #include "rom4.h"
 #include "clock.h"
 #include "script.h"
@@ -537,35 +539,35 @@ void PerStepCallback_8069AA0(u8 taskId)
 }
 
 const u16 gUnknown_083763E4[] = {
-         0,
-         0,
-         0,
-         0,
-         0,
-         0,
-    0x4001,
-    0x4002,
-    0x4003,
-    0x4004,
-         0,
-         0,
-    0x4005,
-    0x4006,
-    0x4007,
-         0,
-         0,
-    0x4008,
-    0x4009,
-    0x400A,
-         0,
-         0,
-         0,
-         0,
-         0,
-         0
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    VAR_0x4001,
+    VAR_0x4002,
+    VAR_0x4003,
+    VAR_0x4004,
+    0,
+    0,
+    VAR_0x4005,
+    VAR_0x4006,
+    VAR_0x4007,
+    0,
+    0,
+    VAR_0x4008,
+    VAR_0x4009,
+    VAR_0x400A,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0
 };
 
-bool8 sub_8069CB8(s16 x, s16 y)
+bool32 sub_8069CB8(s16 x, s16 y)
 {
     if ((u16)(x - 3) < 11 && (u16)(y - 6) < 14 && gUnknown_083763E4[y])
     {
@@ -573,3 +575,26 @@ bool8 sub_8069CB8(s16 x, s16 y)
     }
     return FALSE;
 }
+
+void sub_8069CFC(s16 x, s16 y)
+{
+    if (sub_8069CB8(x, y))
+    {
+        *GetVarPointer(gUnknown_083763E4[y]) |= (1 << (x - 3));
+    }
+}
+
+bool32 sub_8069D34(s16 x, s16 y)
+{
+    u32 var;
+    if (!sub_8069CB8(x, y))
+    {
+        return FALSE;
+    }
+    var = VarGet(gUnknown_083763E4[y]) << 16;
+    if (((1 << 16) << (x - 3)) & var)
+    {
+        return TRUE;
+    }
+    return FALSE;
+}
-- 
cgit v1.2.3


From e8acc9564ef11ca8f7d20b1ed1fbd34e6850e2a3 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 26 Jun 2017 21:53:54 -0400
Subject: sub_8069D78

---
 asm/field_tasks.s | 52 ----------------------------------------------------
 src/field_tasks.c | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 52 deletions(-)

diff --git a/asm/field_tasks.s b/asm/field_tasks.s
index ab4d75609..ab6b9c8c6 100755
--- a/asm/field_tasks.s
+++ b/asm/field_tasks.s
@@ -6,58 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_8069D78
-sub_8069D78: @ 8069D78
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	ldr r0, _08069DCC @ =gMapHeader
-	ldr r0, [r0]
-	ldr r1, [r0]
-	mov r9, r1
-	ldr r7, [r0, 0x4]
-	movs r5, 0
-	cmp r5, r9
-	bge _08069DC0
-_08069D90:
-	movs r4, 0
-	adds r0, r5, 0x1
-	mov r8, r0
-	cmp r4, r7
-	bge _08069DBA
-	lsls r6, r5, 16
-_08069D9C:
-	lsls r1, r4, 16
-	asrs r1, 16
-	asrs r0, r6, 16
-	bl sub_8069D34
-	cmp r0, 0x1
-	bne _08069DB4
-	adds r1, r4, 0x7
-	adds r0, r5, 0x7
-	ldr r2, _08069DD0 @ =0x0000020e
-	bl MapGridSetMetatileIdAt
-_08069DB4:
-	adds r4, 0x1
-	cmp r4, r7
-	blt _08069D9C
-_08069DBA:
-	mov r5, r8
-	cmp r5, r9
-	blt _08069D90
-_08069DC0:
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08069DCC: .4byte gMapHeader
-_08069DD0: .4byte 0x0000020e
-	thumb_func_end sub_8069D78
-
 	thumb_func_start PerStepCallback_8069DD4
 PerStepCallback_8069DD4: @ 8069DD4
 	push {r4-r7,lr}
diff --git a/src/field_tasks.c b/src/field_tasks.c
index 92b8d3bb8..cc87a201e 100755
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -598,3 +598,20 @@ bool32 sub_8069D34(s16 x, s16 y)
     }
     return FALSE;
 }
+
+void sub_8069D78(void)
+{
+    s32 x, y;
+    s32 width = gMapHeader.mapData->width;
+    s32 height = gMapHeader.mapData->height;
+    for (x=0; x<width; x++)
+    {
+        for (y=0; y<height; y++)
+        {
+            if (sub_8069D34(x, y) == TRUE)
+            {
+                MapGridSetMetatileIdAt(x + 7, y + 7, 0x20e);
+            }
+        }
+    }
+}
-- 
cgit v1.2.3


From b8c5ff4a42662ca8810d10e2509cff7923d73d08 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 26 Jun 2017 22:15:36 -0400
Subject: PerStepCallback_8069DD4

---
 asm/field_tasks.s | 202 ------------------------------------------------------
 src/field_tasks.c |  74 ++++++++++++++++++++
 2 files changed, 74 insertions(+), 202 deletions(-)

diff --git a/asm/field_tasks.s b/asm/field_tasks.s
index ab6b9c8c6..6549ea29d 100755
--- a/asm/field_tasks.s
+++ b/asm/field_tasks.s
@@ -6,208 +6,6 @@
 
 	.text
 
-	thumb_func_start PerStepCallback_8069DD4
-PerStepCallback_8069DD4: @ 8069DD4
-	push {r4-r7,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, _08069DF8 @ =gTasks + 0x8
-	adds r5, r1, r0
-	movs r1, 0x2
-	ldrsh r0, [r5, r1]
-	cmp r0, 0x1
-	beq _08069E20
-	cmp r0, 0x1
-	bgt _08069DFC
-	cmp r0, 0
-	beq _08069E08
-	b _08069F56
-	.align 2, 0
-_08069DF8: .4byte gTasks + 0x8
-_08069DFC:
-	cmp r0, 0x2
-	beq _08069EB6
-	cmp r0, 0x3
-	bne _08069E06
-	b _08069F10
-_08069E06:
-	b _08069F56
-_08069E08:
-	mov r4, sp
-	adds r4, 0x2
-	mov r0, sp
-	adds r1, r4, 0
-	bl PlayerGetDestCoords
-	mov r0, sp
-	ldrh r0, [r0]
-	strh r0, [r5, 0x4]
-	ldrh r0, [r4]
-	strh r0, [r5, 0x6]
-	b _08069F52
-_08069E20:
-	mov r7, sp
-	adds r7, 0x2
-	mov r0, sp
-	adds r1, r7, 0
-	bl PlayerGetDestCoords
-	mov r0, sp
-	ldrh r2, [r0]
-	movs r3, 0
-	ldrsh r1, [r0, r3]
-	movs r3, 0x4
-	ldrsh r0, [r5, r3]
-	cmp r1, r0
-	bne _08069E4A
-	movs r0, 0
-	ldrsh r1, [r7, r0]
-	movs r3, 0x6
-	ldrsh r0, [r5, r3]
-	cmp r1, r0
-	bne _08069E4A
-	b _08069F56
-_08069E4A:
-	strh r2, [r5, 0x4]
-	ldrh r0, [r7]
-	strh r0, [r5, 0x6]
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	movs r2, 0
-	ldrsh r1, [r7, r2]
-	bl MapGridGetMetatileBehaviorAt
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	ldr r0, _08069E8C @ =0x00004022
-	bl GetVarPointer
-	adds r6, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r4, 0
-	bl MetatileBehavior_IsThinIce
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _08069E90
-	ldrh r0, [r6]
-	adds r0, 0x1
-	strh r0, [r6]
-	movs r0, 0x4
-	strh r0, [r5, 0xC]
-	movs r0, 0x2
-	b _08069EA8
-	.align 2, 0
-_08069E8C: .4byte 0x00004022
-_08069E90:
-	adds r0, r4, 0
-	bl MetatileBehavior_IsCrackedIce
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _08069F56
-	movs r0, 0
-	strh r0, [r6]
-	movs r0, 0x4
-	strh r0, [r5, 0xC]
-	movs r0, 0x3
-_08069EA8:
-	strh r0, [r5, 0x2]
-	mov r0, sp
-	ldrh r0, [r0]
-	strh r0, [r5, 0x8]
-	ldrh r0, [r7]
-	strh r0, [r5, 0xA]
-	b _08069F56
-_08069EB6:
-	ldrh r1, [r5, 0xC]
-	movs r3, 0xC
-	ldrsh r0, [r5, r3]
-	cmp r0, 0
-	bne _08069F1A
-	mov r1, sp
-	ldrh r0, [r5, 0x8]
-	strh r0, [r1]
-	mov r4, sp
-	adds r4, 0x2
-	ldrh r0, [r5, 0xA]
-	strh r0, [r4]
-	movs r0, 0x2A
-	bl PlaySE
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	movs r2, 0
-	ldrsh r1, [r4, r2]
-	ldr r2, _08069F0C @ =0x0000020e
-	bl MapGridSetMetatileIdAt
-	mov r0, sp
-	movs r3, 0
-	ldrsh r0, [r0, r3]
-	movs r2, 0
-	ldrsh r1, [r4, r2]
-	bl CurrentMapDrawMetatileAt
-	mov r0, sp
-	ldrh r0, [r0]
-	subs r0, 0x7
-	lsls r0, 16
-	asrs r0, 16
-	ldrh r1, [r4]
-	subs r1, 0x7
-	lsls r1, 16
-	asrs r1, 16
-	bl sub_8069CFC
-	b _08069F52
-	.align 2, 0
-_08069F0C: .4byte 0x0000020e
-_08069F10:
-	ldrh r1, [r5, 0xC]
-	movs r3, 0xC
-	ldrsh r0, [r5, r3]
-	cmp r0, 0
-	beq _08069F20
-_08069F1A:
-	subs r0, r1, 0x1
-	strh r0, [r5, 0xC]
-	b _08069F56
-_08069F20:
-	mov r1, sp
-	ldrh r0, [r5, 0x8]
-	strh r0, [r1]
-	mov r4, sp
-	adds r4, 0x2
-	ldrh r0, [r5, 0xA]
-	strh r0, [r4]
-	movs r0, 0x29
-	bl PlaySE
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	movs r2, 0
-	ldrsh r1, [r4, r2]
-	ldr r2, _08069F60 @ =0x00000206
-	bl MapGridSetMetatileIdAt
-	mov r0, sp
-	movs r3, 0
-	ldrsh r0, [r0, r3]
-	movs r2, 0
-	ldrsh r1, [r4, r2]
-	bl CurrentMapDrawMetatileAt
-_08069F52:
-	movs r0, 0x1
-	strh r0, [r5, 0x2]
-_08069F56:
-	add sp, 0x4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08069F60: .4byte 0x00000206
-	thumb_func_end PerStepCallback_8069DD4
-
 	thumb_func_start PerStepCallback_8069F64
 PerStepCallback_8069F64: @ 8069F64
 	push {r4,r5,lr}
diff --git a/src/field_tasks.c b/src/field_tasks.c
index cc87a201e..f68c6bbe4 100755
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -615,3 +615,77 @@ void sub_8069D78(void)
         }
     }
 }
+
+void PerStepCallback_8069DD4(u8 taskId)
+{
+    s16 x, y;
+    u16 tileBehavior;
+    u16 *var;
+    s16 *data = gTasks[taskId].data;
+    switch (data[1])
+    {
+        case 0:
+            PlayerGetDestCoords(&x, &y);
+            data[2] = x;
+            data[3] = y;
+            data[1] = 1;
+            break;
+        case 1:
+            PlayerGetDestCoords(&x, &y);
+            if (x != data[2] || y != data[3])
+            {
+                data[2] = x;
+                data[3] = y;
+                tileBehavior = MapGridGetMetatileBehaviorAt(x, y);
+                var = GetVarPointer(VAR_ICE_STEP_COUNT);
+                if (MetatileBehavior_IsThinIce(tileBehavior) == TRUE)
+                {
+                    (*var)++;
+                    data[6] = 4;
+                    data[1] = 2;
+                    data[4] = x;
+                    data[5] = y;
+                }
+                else if (MetatileBehavior_IsCrackedIce(tileBehavior) == TRUE)
+                {
+                    *var = 0;
+                    data[6] = 4;
+                    data[1] = 3;
+                    data[4] = x;
+                    data[5] = y;
+                }
+            }
+            break;
+        case 2:
+            if (data[6] != 0)
+            {
+                data[6]--;
+            }
+            else
+            {
+                x = data[4];
+                y = data[5];
+                PlaySE(SE_RU_BARI);
+                MapGridSetMetatileIdAt(x, y, 0x20e);
+                CurrentMapDrawMetatileAt(x, y);
+                sub_8069CFC(x - 7, y - 7);
+                data[1] = 1;
+            }
+            break;
+        case 3:
+            if (data[6] != 0)
+            {
+                data[6]--;
+            }
+            else
+            {
+                x = data[4];
+                y = data[5];
+                PlaySE(SE_RU_GASYAN);
+                MapGridSetMetatileIdAt(x, y, 0x206);
+                CurrentMapDrawMetatileAt(x, y);
+                data[1] = 1;
+            }
+            break;
+    }
+}
-- 
cgit v1.2.3


From 57a6a5e6564aec89ab45f2d4c3b911f59f7db210 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 26 Jun 2017 22:26:02 -0400
Subject: PerStepCallback_8069F64

---
 asm/field_tasks.s              | 105 -----------------------------------------
 include/field_effect_helpers.h |   1 +
 src/field_tasks.c              |  35 ++++++++++++++
 3 files changed, 36 insertions(+), 105 deletions(-)
 mode change 100644 => 100755 include/field_effect_helpers.h

diff --git a/asm/field_tasks.s b/asm/field_tasks.s
index 6549ea29d..a1541d822 100755
--- a/asm/field_tasks.s
+++ b/asm/field_tasks.s
@@ -6,111 +6,6 @@
 
 	.text
 
-	thumb_func_start PerStepCallback_8069F64
-PerStepCallback_8069F64: @ 8069F64
-	push {r4,r5,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, _08069FE8 @ =gTasks + 0x8
-	adds r5, r1, r0
-	mov r4, sp
-	adds r4, 0x2
-	mov r0, sp
-	adds r1, r4, 0
-	bl PlayerGetDestCoords
-	mov r0, sp
-	ldrh r2, [r0]
-	movs r3, 0
-	ldrsh r1, [r0, r3]
-	movs r3, 0x2
-	ldrsh r0, [r5, r3]
-	cmp r1, r0
-	bne _08069F9E
-	movs r0, 0
-	ldrsh r1, [r4, r0]
-	movs r3, 0x4
-	ldrsh r0, [r5, r3]
-	cmp r1, r0
-	beq _0806A02A
-_08069F9E:
-	strh r2, [r5, 0x2]
-	ldrh r0, [r4]
-	strh r0, [r5, 0x4]
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	movs r2, 0
-	ldrsh r1, [r4, r2]
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl MetatileBehavior_IsAshGrass
-	lsls r0, 24
-	cmp r0, 0
-	beq _0806A02A
-	mov r0, sp
-	movs r3, 0
-	ldrsh r0, [r0, r3]
-	movs r2, 0
-	ldrsh r1, [r4, r2]
-	bl MapGridGetMetatileIdAt
-	ldr r1, _08069FEC @ =0x0000020a
-	cmp r0, r1
-	bne _08069FF4
-	mov r0, sp
-	movs r3, 0
-	ldrsh r0, [r0, r3]
-	movs r2, 0
-	ldrsh r1, [r4, r2]
-	ldr r2, _08069FF0 @ =0x00000212
-	movs r3, 0x4
-	bl ash
-	b _0806A006
-	.align 2, 0
-_08069FE8: .4byte gTasks + 0x8
-_08069FEC: .4byte 0x0000020a
-_08069FF0: .4byte 0x00000212
-_08069FF4:
-	mov r0, sp
-	movs r3, 0
-	ldrsh r0, [r0, r3]
-	movs r2, 0
-	ldrsh r1, [r4, r2]
-	ldr r2, _0806A034 @ =0x00000206
-	movs r3, 0x4
-	bl ash
-_0806A006:
-	movs r0, 0x87
-	lsls r0, 1
-	movs r1, 0x1
-	bl CheckBagHasItem
-	lsls r0, 24
-	cmp r0, 0
-	beq _0806A02A
-	ldr r0, _0806A038 @ =0x00004048
-	bl GetVarPointer
-	adds r2, r0, 0
-	ldrh r1, [r2]
-	ldr r0, _0806A03C @ =0x0000270e
-	cmp r1, r0
-	bhi _0806A02A
-	adds r0, r1, 0x1
-	strh r0, [r2]
-_0806A02A:
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0806A034: .4byte 0x00000206
-_0806A038: .4byte 0x00004048
-_0806A03C: .4byte 0x0000270e
-	thumb_func_end PerStepCallback_8069F64
-
 	thumb_func_start sub_806A040
 sub_806A040: @ 806A040
 	push {r4,r5,lr}
diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h
old mode 100644
new mode 100755
index 56838fc3a..895d861e2
--- a/include/field_effect_helpers.h
+++ b/include/field_effect_helpers.h
@@ -9,5 +9,6 @@ void sub_8126BC4(u8 unk_1B, u8 r6, s16 x, s16 y);
 void sub_8127ED0(u8, u8);
 void sub_8127F28(u8, u8, s16);
 u8 sub_8128124(u8 id);
+void ash(s16, s16, u16, u8);
 
 #endif // GUARD_FIELD_EFFECT_HELPERS_H
diff --git a/src/field_tasks.c b/src/field_tasks.c
index f68c6bbe4..ea70cf227 100755
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -6,11 +6,14 @@
 #include "task.h"
 #include "main.h"
 #include "vars.h"
+#include "item.h"
+#include "items.h"
 #include "event_data.h"
 #include "rom4.h"
 #include "clock.h"
 #include "script.h"
 #include "field_special_scene.h"
+#include "field_effect_helpers.h"
 #include "secret_base.h"
 #include "metatile_behavior.h"
 #include "fieldmap.h"
@@ -689,3 +692,35 @@ void PerStepCallback_8069DD4(u8 taskId)
             break;
     }
 }
+
+void PerStepCallback_8069F64(u8 taskId)
+{
+    s16 x, y;
+    u16 *var;
+    s16 *data = gTasks[taskId].data;
+    PlayerGetDestCoords(&x, &y);
+    if (x != data[1] || y != data[2])
+    {
+        data[1] = x;
+        data[2] = y;
+        if (MetatileBehavior_IsAshGrass(MapGridGetMetatileBehaviorAt(x, y)))
+        {
+            if (MapGridGetMetatileIdAt(x, y) == 0x20a)
+            {
+                ash(x, y, 0x212, 4);
+            }
+            else
+            {
+                ash(x, y, 0x206, 4);
+            }
+            if (CheckBagHasItem(ITEM_SOOT_SACK, 1))
+            {
+                var = GetVarPointer(VAR_ASH_GATHER_COUNT);
+                if (*var < 9999)
+                {
+                    (*var)++;
+                }
+            }
+        }
+    }
+}
-- 
cgit v1.2.3


From 2c4dc3b5be3b45a50387b1b0677d8f4b64391575 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 26 Jun 2017 22:32:18 -0400
Subject: sub_806A040

---
 asm/field_tasks.s | 30 ------------------------------
 src/field_tasks.c |  6 ++++++
 2 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/asm/field_tasks.s b/asm/field_tasks.s
index a1541d822..188b67c64 100755
--- a/asm/field_tasks.s
+++ b/asm/field_tasks.s
@@ -6,36 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_806A040
-sub_806A040: @ 806A040
-	push {r4,r5,lr}
-	lsls r0, 16
-	asrs r5, r0, 16
-	lsls r1, 16
-	asrs r4, r1, 16
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl MapGridGetMetatileIdAt
-	ldr r1, _0806A074 @ =0x0000022f
-	ldr r2, _0806A078 @ =0x00000237
-	cmp r0, r1
-	bne _0806A05C
-	subs r2, 0x31
-_0806A05C:
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl MapGridSetMetatileIdAt
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl CurrentMapDrawMetatileAt
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0806A074: .4byte 0x0000022f
-_0806A078: .4byte 0x00000237
-	thumb_func_end sub_806A040
-
 	thumb_func_start PerStepCallback_806A07C
 PerStepCallback_806A07C: @ 806A07C
 	push {r4-r7,lr}
diff --git a/src/field_tasks.c b/src/field_tasks.c
index ea70cf227..021f2c070 100755
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -724,3 +724,9 @@ void PerStepCallback_8069F64(u8 taskId)
         }
     }
 }
+
+void sub_806A040(s16 x, s16 y)
+{
+    MapGridSetMetatileIdAt(x, y, MapGridGetMetatileIdAt(x, y) == 0x22f ? 0x206 : 0x237);
+    CurrentMapDrawMetatileAt(x, y);
+}
-- 
cgit v1.2.3


From a3c3267a9c915f86b986df90e747e12a90bcf5b5 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 27 Jun 2017 08:26:08 -0400
Subject: PerStepCallback_806A07C

---
 asm/field_tasks.s | 135 ------------------------------------------------------
 src/field_tasks.c |  46 +++++++++++++++++++
 2 files changed, 46 insertions(+), 135 deletions(-)

diff --git a/asm/field_tasks.s b/asm/field_tasks.s
index 188b67c64..99c54a0d4 100755
--- a/asm/field_tasks.s
+++ b/asm/field_tasks.s
@@ -6,141 +6,6 @@
 
 	.text
 
-	thumb_func_start PerStepCallback_806A07C
-PerStepCallback_806A07C: @ 806A07C
-	push {r4-r7,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, _0806A164 @ =gTasks + 0x8
-	adds r5, r1, r0
-	mov r4, sp
-	adds r4, 0x2
-	mov r0, sp
-	adds r1, r4, 0
-	bl PlayerGetDestCoords
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	movs r2, 0
-	ldrsh r1, [r4, r2]
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 16
-	lsrs r6, r0, 16
-	ldrh r1, [r5, 0x8]
-	movs r3, 0x8
-	ldrsh r0, [r5, r3]
-	adds r7, r4, 0
-	cmp r0, 0
-	beq _0806A0CE
-	subs r0, r1, 0x1
-	strh r0, [r5, 0x8]
-	lsls r0, 16
-	cmp r0, 0
-	bne _0806A0CE
-	movs r1, 0xA
-	ldrsh r0, [r5, r1]
-	movs r2, 0xC
-	ldrsh r1, [r5, r2]
-	bl sub_806A040
-_0806A0CE:
-	ldrh r1, [r5, 0xE]
-	movs r3, 0xE
-	ldrsh r0, [r5, r3]
-	cmp r0, 0
-	beq _0806A0EE
-	subs r0, r1, 0x1
-	strh r0, [r5, 0xE]
-	lsls r0, 16
-	cmp r0, 0
-	bne _0806A0EE
-	movs r1, 0x10
-	ldrsh r0, [r5, r1]
-	movs r2, 0x12
-	ldrsh r1, [r5, r2]
-	bl sub_806A040
-_0806A0EE:
-	lsls r0, r6, 24
-	lsrs r6, r0, 24
-	adds r0, r6, 0
-	bl MetatileBehavior_IsCrackedFloorHole
-	lsls r0, 24
-	cmp r0, 0
-	beq _0806A106
-	ldr r0, _0806A168 @ =0x00004022
-	movs r1, 0
-	bl VarSet
-_0806A106:
-	mov r0, sp
-	ldrh r2, [r0]
-	movs r3, 0
-	ldrsh r1, [r0, r3]
-	movs r3, 0x4
-	ldrsh r0, [r5, r3]
-	cmp r1, r0
-	bne _0806A122
-	movs r0, 0
-	ldrsh r1, [r7, r0]
-	movs r3, 0x6
-	ldrsh r0, [r5, r3]
-	cmp r1, r0
-	beq _0806A182
-_0806A122:
-	strh r2, [r5, 0x4]
-	adds r4, r7, 0
-	ldrh r0, [r4]
-	strh r0, [r5, 0x6]
-	adds r0, r6, 0
-	bl MetatileBehavior_IsCrackedFloor
-	lsls r0, 24
-	cmp r0, 0
-	beq _0806A182
-	bl GetPlayerSpeed
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x4
-	beq _0806A14A
-	ldr r0, _0806A168 @ =0x00004022
-	movs r1, 0
-	bl VarSet
-_0806A14A:
-	movs r1, 0x8
-	ldrsh r0, [r5, r1]
-	cmp r0, 0
-	bne _0806A16C
-	movs r0, 0x3
-	strh r0, [r5, 0x8]
-	mov r0, sp
-	ldrh r0, [r0]
-	strh r0, [r5, 0xA]
-	ldrh r0, [r4]
-	strh r0, [r5, 0xC]
-	b _0806A182
-	.align 2, 0
-_0806A164: .4byte gTasks + 0x8
-_0806A168: .4byte 0x00004022
-_0806A16C:
-	movs r2, 0xE
-	ldrsh r0, [r5, r2]
-	cmp r0, 0
-	bne _0806A182
-	movs r0, 0x3
-	strh r0, [r5, 0xE]
-	mov r0, sp
-	ldrh r0, [r0]
-	strh r0, [r5, 0x10]
-	ldrh r0, [r7]
-	strh r0, [r5, 0x12]
-_0806A182:
-	add sp, 0x4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end PerStepCallback_806A07C
-
 	thumb_func_start sub_806A18C
 sub_806A18C: @ 806A18C
 	push {r4,r5,lr}
diff --git a/src/field_tasks.c b/src/field_tasks.c
index 021f2c070..653d3ffd9 100755
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -6,6 +6,7 @@
 #include "task.h"
 #include "main.h"
 #include "vars.h"
+#include "bike.h"
 #include "item.h"
 #include "items.h"
 #include "event_data.h"
@@ -730,3 +731,48 @@ void sub_806A040(s16 x, s16 y)
     MapGridSetMetatileIdAt(x, y, MapGridGetMetatileIdAt(x, y) == 0x22f ? 0x206 : 0x237);
     CurrentMapDrawMetatileAt(x, y);
 }
+
+void PerStepCallback_806A07C(u8 taskId)
+{
+    s16 x, y;
+    u16 behavior;
+    s16 *data = gTasks[taskId].data;
+    PlayerGetDestCoords(&x, &y);
+    behavior = MapGridGetMetatileBehaviorAt(x, y);
+    if (data[4] != 0 && (--data[4]) == 0)
+    {
+        sub_806A040(data[5], data[6]);
+    }
+    if (data[7] != 0 && (--data[7]) == 0)
+    {
+        sub_806A040(data[8], data[9]);
+    }
+    if (MetatileBehavior_IsCrackedFloorHole(behavior))
+    {
+        VarSet(VAR_ICE_STEP_COUNT, 0); // this var does double duty
+    }
+    if ((x != data[2] || y != data[3]))
+    {
+        data[2] = x;
+        data[3] = y;
+        if (MetatileBehavior_IsCrackedFloor(behavior))
+        {
+            if (GetPlayerSpeed() != 4)
+            {
+                VarSet(VAR_ICE_STEP_COUNT, 0); // this var does double duty
+            }
+            if (data[4] == 0)
+            {
+                data[4] = 3;
+                data[5] = x;
+                data[6] = y;
+            }
+            else if (data[7] == 0)
+            {
+                data[7] = 3;
+                data[8] = x;
+                data[9] = y;
+            }
+        }
+    }
+}
-- 
cgit v1.2.3


From 0687a65dc9b67d99d7bb8bdb656ce0c358a57f66 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 27 Jun 2017 08:34:22 -0400
Subject: Through sub_806A18C

---
 asm/field_tasks.s  | 50 --------------------------------------------------
 data/field_tasks.s |  8 --------
 ld_script.txt      |  1 -
 src/field_tasks.c  | 18 ++++++++++++++++++
 4 files changed, 18 insertions(+), 59 deletions(-)
 delete mode 100755 data/field_tasks.s

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);
+}
-- 
cgit v1.2.3


From 41cc0382a43161c0c66ddaf73742ecec8dcbdcc6 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Tue, 27 Jun 2017 09:43:57 -0400
Subject: Finish decompiling field_tasks.s

---
 asm/field_tasks.s      | 177 -------------------------------------------------
 include/field_camera.h |   2 +
 ld_script.txt          |   1 -
 src/field_tasks.c      |  63 ++++++++++++++++++
 4 files changed, 65 insertions(+), 178 deletions(-)
 delete mode 100755 asm/field_tasks.s

diff --git a/asm/field_tasks.s b/asm/field_tasks.s
deleted file mode 100755
index 3b5eb1021..000000000
--- a/asm/field_tasks.s
+++ /dev/null
@@ -1,177 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start Task_MuddySlope
-Task_MuddySlope: @ 806A1E8
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, _0806A230 @ =gTasks + 0x8
-	adds r4, r1, r0
-	mov r5, sp
-	adds r5, 0x2
-	mov r0, sp
-	adds r1, r5, 0
-	bl PlayerGetDestCoords
-	ldr r0, _0806A234 @ =gSaveBlock1
-	movs r1, 0x4
-	ldrsb r1, [r0, r1]
-	lsls r1, 8
-	ldrb r0, [r0, 0x5]
-	lsls r0, 24
-	asrs r0, 24
-	orrs r0, r1
-	lsls r0, 16
-	lsrs r7, r0, 16
-	movs r0, 0x2
-	ldrsh r1, [r4, r0]
-	mov r8, r5
-	cmp r1, 0
-	beq _0806A238
-	cmp r1, 0x1
-	beq _0806A264
-	b _0806A2B8
-	.align 2, 0
-_0806A230: .4byte gTasks + 0x8
-_0806A234: .4byte gSaveBlock1
-_0806A238:
-	strh r7, [r4]
-	mov r0, sp
-	ldrh r0, [r0]
-	strh r0, [r4, 0x4]
-	ldrh r0, [r5]
-	strh r0, [r4, 0x6]
-	movs r0, 0x1
-	strh r0, [r4, 0x2]
-	strh r1, [r4, 0x8]
-	strh r1, [r4, 0xE]
-	strh r1, [r4, 0x14]
-	strh r1, [r4, 0x1A]
-	b _0806A2B8
-_0806A252:
-	movs r0, 0x20
-	strh r0, [r1]
-	mov r0, sp
-	ldrh r0, [r0]
-	strh r0, [r1, 0x2]
-	mov r2, r8
-	ldrh r0, [r2]
-	strh r0, [r1, 0x4]
-	b _0806A2B8
-_0806A264:
-	mov r0, sp
-	movs r3, 0x4
-	ldrsh r1, [r4, r3]
-	ldrh r2, [r0]
-	movs r3, 0
-	ldrsh r0, [r0, r3]
-	cmp r1, r0
-	bne _0806A280
-	movs r0, 0x6
-	ldrsh r1, [r4, r0]
-	movs r3, 0
-	ldrsh r0, [r5, r3]
-	cmp r1, r0
-	beq _0806A2B8
-_0806A280:
-	strh r2, [r4, 0x4]
-	ldrh r0, [r5]
-	strh r0, [r4, 0x6]
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	movs r2, 0
-	ldrsh r1, [r5, r2]
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl MetatileBehavior_IsMuddySlope
-	lsls r0, 24
-	cmp r0, 0
-	beq _0806A2B8
-	movs r6, 0x4
-	adds r1, r4, 0
-	adds r1, 0x8
-_0806A2A8:
-	movs r3, 0
-	ldrsh r0, [r1, r3]
-	cmp r0, 0
-	beq _0806A252
-	adds r1, 0x6
-	adds r6, 0x3
-	cmp r6, 0xD
-	ble _0806A2A8
-_0806A2B8:
-	ldr r2, _0806A2D4 @ =gUnknown_0202E844
-	ldrb r1, [r2]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _0806A2D8
-	movs r1, 0
-	ldrsh r0, [r4, r1]
-	cmp r7, r0
-	beq _0806A2D8
-	strh r7, [r4]
-	ldrh r0, [r2, 0x4]
-	ldrh r1, [r2, 0x8]
-	b _0806A2DC
-	.align 2, 0
-_0806A2D4: .4byte gUnknown_0202E844
-_0806A2D8:
-	movs r0, 0
-	movs r1, 0
-_0806A2DC:
-	lsls r0, 16
-	asrs r0, 16
-	mov r8, r0
-	lsls r0, r1, 16
-	asrs r7, r0, 16
-	adds r5, r4, 0
-	adds r5, 0x8
-	adds r4, r5, 0
-	movs r6, 0x9
-_0806A2EE:
-	movs r2, 0
-	ldrsh r0, [r4, r2]
-	cmp r0, 0
-	beq _0806A312
-	ldrh r0, [r4, 0x2]
-	mov r3, r8
-	subs r0, r3
-	strh r0, [r4, 0x2]
-	ldrh r0, [r4, 0x4]
-	subs r0, r7
-	strh r0, [r4, 0x4]
-	movs r0, 0x2
-	ldrsh r1, [r4, r0]
-	movs r3, 0x4
-	ldrsh r2, [r4, r3]
-	adds r0, r5, 0
-	bl sub_806A18C
-_0806A312:
-	adds r4, 0x6
-	adds r5, 0x6
-	subs r6, 0x3
-	cmp r6, 0
-	bge _0806A2EE
-	add sp, 0x4
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end Task_MuddySlope
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/include/field_camera.h b/include/field_camera.h
index 9021b579e..4ce207541 100644
--- a/include/field_camera.h
+++ b/include/field_camera.h
@@ -11,6 +11,8 @@ struct CameraSomething
     s32 unk14;
 };
 
+extern struct Camera gUnknown_0202E844;
+
 void move_tilemap_camera_to_upper_left_corner(void);
 void sub_8057A58(void);
 void sub_8057B14(u16 *a, u16 *b);
diff --git a/ld_script.txt b/ld_script.txt
index 77f404893..ba1b6f532 100755
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -105,7 +105,6 @@ SECTIONS {
         src/event_data.o(.text);
         src/coord_event_weather.o(.text);
         src/field_tasks.o(.text);
-        asm/field_tasks.o(.text);
         src/clock.o(.text);
         asm/reset_rtc_screen.o(.text);
         asm/party_menu.o(.text);
diff --git a/src/field_tasks.c b/src/field_tasks.c
index 8ddef126b..caf2ce6b9 100755
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -794,3 +794,66 @@ void sub_806A18C(s16 *data, s16 x, s16 y)
     CurrentMapDrawMetatileAt(x, y);
     MapGridSetMetatileIdAt(x, y, 0xe8);
 }
+
+void Task_MuddySlope(u8 taskId)
+{
+    s16 x, y, x2, y2;
+    int i;
+    u16 mapIndices;
+    s16 *data = gTasks[taskId].data;
+    PlayerGetDestCoords(&x, &y);
+    mapIndices = (gSaveBlock1.location.mapGroup << 8) | gSaveBlock1.location.mapNum;
+    switch (data[1])
+    {
+        case 0:
+            data[0] = mapIndices;
+            data[2] = x;
+            data[3] = y;
+            data[1] = 1;
+            data[4] = 0;
+            data[7] = 0;
+            data[10] = 0;
+            data[13] = 0;
+            break;
+        case 1:
+            if (data[2] != x || data[3] != y)
+            {
+                data[2] = x;
+                data[3] = y;
+                if (MetatileBehavior_IsMuddySlope(MapGridGetMetatileBehaviorAt(x, y)))
+                {
+                    for (i=4; i<14; i+=3)
+                    {
+                        if (data[i] == 0)
+                        {
+                            data[i] = 32;
+                            data[i + 1] = x;
+                            data[i + 2] = y;
+                            break;
+                        }
+                    }
+                }
+            }
+            break;
+    }
+    if (gUnknown_0202E844.field_0 && mapIndices != data[0])
+    {
+        data[0] = mapIndices;
+        x2 = gUnknown_0202E844.x;
+        y2 = gUnknown_0202E844.y;
+    }
+    else
+    {
+        x2 = 0;
+        y2 = 0;
+    }
+    for (i=4; i<14; i+=3)
+    {
+        if (data[i])
+        {
+            data[i + 1] -= x2;
+            data[i + 2] -= y2;
+            sub_806A18C(&data[i], data[i + 1], data[i + 2]);
+        }
+    }
+}
-- 
cgit v1.2.3