Nonmatching sub_8069638 and callers

2 files changed, 107 insertions, 131 deletions

diff --git a/asm/field_tasks.s b/asm/field_tasks.s
index b869f2ad1..0cccd07ba 100644..100755
--- 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
index 39c2146d6..11f67c330 100644..100755
--- 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);
+}