Finish FldEff_FieldMoveShowMon except solitary nonmatching function

3 files changed, 218 insertions, 292 deletions

diff --git a/asm/field_effect.s b/asm/field_effect.s
index 9b9d03b1a..d84fd7218 100755
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -6,296 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_8088708
-sub_8088708: @ 8088708
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	adds r5, r0, 0
-	ldrh r2, [r5, 0x10]
-	movs r1, 0x10
-	ldrsh r0, [r5, r1]
-	cmp r0, 0x1F
-	ble _08088724
-	movs r0, 0x1
-	b _080887A8
-_08088724:
-	ldrh r0, [r5, 0xE]
-	lsls r0, 16
-	asrs r3, r0, 19
-	movs r1, 0x1F
-	ands r3, r1
-	movs r4, 0x10
-	ldrsh r0, [r5, r4]
-	cmp r3, r0
-	blt _080887A6
-	movs r0, 0x20
-	subs r3, r0, r3
-	ands r3, r1
-	subs r0, r2
-	mov r12, r0
-	mov r7, r12
-	ands r7, r1
-	mov r12, r7
-	ldrh r0, [r5, 0x20]
-	ldr r1, _080887B8 @ =0x06000140
-	adds r1, r0
-	mov r8, r1
-	movs r4, 0
-	ldr r7, _080887BC @ =gDarknessFieldMoveStreaksTilemap
-	mov r10, r7
-	movs r0, 0xF0
-	lsls r0, 8
-	mov r9, r0
-	adds r1, r3, 0x1
-	movs r0, 0x1F
-	ands r1, r0
-	str r1, [sp]
-	mov r6, r12
-	adds r6, 0x1
-	ands r6, r0
-_08088768:
-	lsls r1, r4, 5
-	adds r2, r1, r3
-	lsls r2, 1
-	add r2, r8
-	mov r7, r12
-	adds r0, r7, r1
-	lsls r0, 1
-	add r0, r10
-	ldrh r0, [r0]
-	mov r7, r9
-	orrs r0, r7
-	strh r0, [r2]
-	ldr r0, [sp]
-	adds r2, r1, r0
-	lsls r2, 1
-	add r2, r8
-	adds r1, r6, r1
-	lsls r1, 1
-	add r1, r10
-	ldrh r0, [r1]
-	mov r1, r9
-	orrs r0, r1
-	strh r0, [r2]
-	adds r0, r4, 0x1
-	lsls r0, 16
-	lsrs r4, r0, 16
-	cmp r4, 0x9
-	bls _08088768
-	ldrh r0, [r5, 0x10]
-	adds r0, 0x2
-	strh r0, [r5, 0x10]
-_080887A6:
-	movs r0, 0
-_080887A8:
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080887B8: .4byte 0x06000140
-_080887BC: .4byte gDarknessFieldMoveStreaksTilemap
-	thumb_func_end sub_8088708
-
-	thumb_func_start sub_80887C0
-sub_80887C0: @ 80887C0
-	push {r4-r7,lr}
-	adds r5, r0, 0
-	movs r1, 0x10
-	ldrsh r0, [r5, r1]
-	cmp r0, 0x1F
-	ble _080887D0
-	movs r0, 0x1
-	b _08088824
-_080887D0:
-	ldrh r0, [r5, 0xE]
-	lsls r0, 16
-	asrs r0, 19
-	lsls r0, 16
-	lsrs r2, r0, 16
-	movs r1, 0x10
-	ldrsh r0, [r5, r1]
-	cmp r2, r0
-	blt _08088822
-	ldrh r0, [r5, 0xA]
-	lsls r0, 16
-	asrs r2, r0, 19
-	movs r0, 0x1F
-	ands r2, r0
-	ldrh r0, [r5, 0x20]
-	ldr r1, _0808882C @ =0x06000140
-	adds r6, r0, r1
-	movs r3, 0
-	movs r0, 0xF0
-	lsls r0, 8
-	adds r7, r0, 0
-	adds r4, r2, 0x1
-	movs r0, 0x1F
-	ands r4, r0
-_08088800:
-	lsls r0, r3, 5
-	adds r1, r0, r2
-	lsls r1, 1
-	adds r1, r6
-	strh r7, [r1]
-	adds r0, r4
-	lsls r0, 1
-	adds r0, r6
-	strh r7, [r0]
-	adds r0, r3, 0x1
-	lsls r0, 16
-	lsrs r3, r0, 16
-	cmp r3, 0x9
-	bls _08088800
-	ldrh r0, [r5, 0x10]
-	adds r0, 0x2
-	strh r0, [r5, 0x10]
-_08088822:
-	movs r0, 0
-_08088824:
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0808882C: .4byte 0x06000140
-	thumb_func_end sub_80887C0
-
-	thumb_func_start sub_8088830
-sub_8088830: @ 8088830
-	push {r4-r6,lr}
-	sub sp, 0x8
-	adds r6, r0, 0
-	movs r5, 0x80
-	lsls r5, 24
-	ands r5, r6
-	lsrs r5, 16
-	lsls r5, 16
-	lsrs r5, 16
-	ldr r0, _08088884 @ =0x7fffffff
-	ands r6, r0
-	lsls r0, r6, 16
-	lsrs r0, 16
-	movs r3, 0xA0
-	lsls r3, 1
-	movs r4, 0x50
-	str r4, [sp]
-	movs r4, 0
-	str r4, [sp, 0x4]
-	bl CreateMonSprite_FieldMove
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r2, r0, 4
-	adds r2, r0
-	lsls r2, 2
-	ldr r1, _08088888 @ =gSprites
-	adds r2, r1
-	ldr r1, _0808888C @ =SpriteCallbackDummy
-	str r1, [r2, 0x1C]
-	ldrb r3, [r2, 0x5]
-	movs r1, 0xD
-	negs r1, r1
-	ands r1, r3
-	strb r1, [r2, 0x5]
-	strh r6, [r2, 0x2E]
-	strh r5, [r2, 0x3A]
-	add sp, 0x8
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08088884: .4byte 0x7fffffff
-_08088888: .4byte gSprites
-_0808888C: .4byte SpriteCallbackDummy
-	thumb_func_end sub_8088830
-
-	thumb_func_start sub_8088890
-sub_8088890: @ 8088890
-	push {lr}
-	adds r1, r0, 0
-	ldrh r0, [r1, 0x20]
-	subs r0, 0x14
-	strh r0, [r1, 0x20]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x78
-	bgt _080888D0
-	movs r0, 0x78
-	strh r0, [r1, 0x20]
-	movs r0, 0x1E
-	strh r0, [r1, 0x30]
-	ldr r0, _080888C4 @ =sub_80888D4
-	str r0, [r1, 0x1C]
-	movs r2, 0x3A
-	ldrsh r0, [r1, r2]
-	cmp r0, 0
-	beq _080888C8
-	ldrh r0, [r1, 0x2E]
-	movs r1, 0
-	movs r2, 0x7D
-	movs r3, 0xA
-	bl PlayCry2
-	b _080888D0
-	.align 2, 0
-_080888C4: .4byte sub_80888D4
-_080888C8:
-	ldrh r0, [r1, 0x2E]
-	movs r1, 0
-	bl PlayCry1
-_080888D0:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8088890
-
-	thumb_func_start sub_80888D4
-sub_80888D4: @ 80888D4
-	push {lr}
-	adds r1, r0, 0
-	ldrh r0, [r1, 0x30]
-	subs r0, 0x1
-	strh r0, [r1, 0x30]
-	lsls r0, 16
-	cmp r0, 0
-	bne _080888E8
-	ldr r0, _080888EC @ =sub_80888F0
-	str r0, [r1, 0x1C]
-_080888E8:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080888EC: .4byte sub_80888F0
-	thumb_func_end sub_80888D4
-
-	thumb_func_start sub_80888F0
-sub_80888F0: @ 80888F0
-	push {lr}
-	adds r2, r0, 0
-	ldrh r3, [r2, 0x20]
-	movs r0, 0x20
-	ldrsh r1, [r2, r0]
-	movs r0, 0x40
-	negs r0, r0
-	cmp r1, r0
-	bge _08088908
-	movs r0, 0x1
-	strh r0, [r2, 0x3C]
-	b _0808890E
-_08088908:
-	adds r0, r3, 0
-	subs r0, 0x14
-	strh r0, [r2, 0x20]
-_0808890E:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80888F0
-
 	thumb_func_start FldEff_UseSurf
 FldEff_UseSurf: @ 8088914
 	push {lr}
diff --git a/include/global.h b/include/global.h
index 67a9548b6..13db2620f 100644..100755
--- a/include/global.h
+++ b/include/global.h
@@ -12,6 +12,14 @@
 
 #define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided\n")
 
+#define nonmatching(fndec, x) {\
+__attribute__((naked))\
+fndec\
+{\
+	asm_unified(x);\
+}\
+}
+
 #define ARRAY_COUNT(array) (sizeof(array) / sizeof((array)[0]))
 
 #define POKEMON_NAME_LENGTH 10
diff --git a/src/field_effect.c b/src/field_effect.c
index 53f8aaed4..12a5e1092 100755
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -2017,10 +2017,10 @@ extern const void (*gUnknown_0839F3AC[7])(struct Task *);
 extern const void (*gUnknown_0839F3C8[7])(struct Task *);
 extern const u32 gFieldMoveStreaksTiles[0x200];
 extern const u16 gFieldMoveStreaksPalette[16];
-extern const u16 gFieldMoveStreaksTilemap[0x140];
+extern const u16 gFieldMoveStreaksTilemap[10 * 32];
 extern const u32 gDarknessFieldMoveStreaksTiles[0x80];
 extern const u16 gDarknessFieldMoveStreaksPalette[16];
-extern const u16 gDarknessFieldMoveStreaksTilemap[0x140];
+extern const u16 gDarknessFieldMoveStreaksTilemap[10 * 32];
 void sub_80883DC(void);
 void sub_808843C(u16);
 void sub_8088890(struct Sprite *);
@@ -2307,3 +2307,211 @@ void sub_80886F8(struct Task *task)
     task->data[1] -= 16;
     task->data[3] += 16;
 }
+
+#ifdef NONMATCHING
+bool8 sub_8088708(struct Task *task)
+{
+    u16 i;
+    u16 srcOffs;
+    u16 dstOffs;
+    u16 *dest;
+    if (task->data[4] >= 32)
+    {
+        return TRUE;
+    }
+    dstOffs = (task->data[3] >> 3) & 0x1f;
+    if (dstOffs >= task->data[4])
+    {
+        dstOffs = (32 - dstOffs) & 0x1f;
+        srcOffs = (32 - task->data[4]) & 0x1f;
+        dest = (u16 *)(VRAM + 0x140 + (u16)task->data[12]);
+        for (i=0; i<10; i++)
+        {
+            dest[dstOffs + i * 32] = gDarknessFieldMoveStreaksTilemap[srcOffs + i * 32] | 0xf000;
+            dest[((dstOffs + 1) & 0x1f) + i * 32] = gDarknessFieldMoveStreaksTilemap[((srcOffs + 1) & 0x1f) + i * 32] | 0xf000;
+        }
+        task->data[4] += 2;
+    }
+    return FALSE;
+}
+#else
+__attribute__((naked))
+bool8 sub_8088708(struct Task *task)
+{
+    asm_unified("\tpush {r4-r7,lr}\n"
+                    "\tmov r7, r10\n"
+                    "\tmov r6, r9\n"
+                    "\tmov r5, r8\n"
+                    "\tpush {r5-r7}\n"
+                    "\tsub sp, 0x4\n"
+                    "\tadds r5, r0, 0\n"
+                    "\tldrh r2, [r5, 0x10]\n"
+                    "\tmovs r1, 0x10\n"
+                    "\tldrsh r0, [r5, r1]\n"
+                    "\tcmp r0, 0x1F\n"
+                    "\tble _08088724\n"
+                    "\tmovs r0, 0x1\n"
+                    "\tb _080887A8\n"
+                    "_08088724:\n"
+                    "\tldrh r0, [r5, 0xE]\n"
+                    "\tlsls r0, 16\n"
+                    "\tasrs r3, r0, 19\n"
+                    "\tmovs r1, 0x1F\n"
+                    "\tands r3, r1\n"
+                    "\tmovs r4, 0x10\n"
+                    "\tldrsh r0, [r5, r4]\n"
+                    "\tcmp r3, r0\n"
+                    "\tblt _080887A6\n"
+                    "\tmovs r0, 0x20\n"
+                    "\tsubs r3, r0, r3\n"
+                    "\tands r3, r1\n"
+                    "\tsubs r0, r2\n"
+                    "\tmov r12, r0\n"
+                    "\tmov r7, r12\n"
+                    "\tands r7, r1\n"
+                    "\tmov r12, r7\n"
+                    "\tldrh r0, [r5, 0x20]\n"
+                    "\tldr r1, _080887B8 @ =0x06000140\n"
+                    "\tadds r1, r0\n"
+                    "\tmov r8, r1\n"
+                    "\tmovs r4, 0\n"
+                    "\tldr r7, _080887BC @ =gDarknessFieldMoveStreaksTilemap\n"
+                    "\tmov r10, r7\n"
+                    "\tmovs r0, 0xF0\n"
+                    "\tlsls r0, 8\n"
+                    "\tmov r9, r0\n"
+                    "\tadds r1, r3, 0x1\n"
+                    "\tmovs r0, 0x1F\n"
+                    "\tands r1, r0\n"
+                    "\tstr r1, [sp]\n"
+                    "\tmov r6, r12\n"
+                    "\tadds r6, 0x1\n"
+                    "\tands r6, r0\n"
+                    "_08088768:\n"
+                    "\tlsls r1, r4, 5\n"
+                    "\tadds r2, r1, r3\n"
+                    "\tlsls r2, 1\n"
+                    "\tadd r2, r8\n"
+                    "\tmov r7, r12\n"
+                    "\tadds r0, r7, r1\n"
+                    "\tlsls r0, 1\n"
+                    "\tadd r0, r10\n"
+                    "\tldrh r0, [r0]\n"
+                    "\tmov r7, r9\n"
+                    "\torrs r0, r7\n"
+                    "\tstrh r0, [r2]\n"
+                    "\tldr r0, [sp]\n"
+                    "\tadds r2, r1, r0\n"
+                    "\tlsls r2, 1\n"
+                    "\tadd r2, r8\n"
+                    "\tadds r1, r6, r1\n"
+                    "\tlsls r1, 1\n"
+                    "\tadd r1, r10\n"
+                    "\tldrh r0, [r1]\n"
+                    "\tmov r1, r9\n"
+                    "\torrs r0, r1\n"
+                    "\tstrh r0, [r2]\n"
+                    "\tadds r0, r4, 0x1\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r4, r0, 16\n"
+                    "\tcmp r4, 0x9\n"
+                    "\tbls _08088768\n"
+                    "\tldrh r0, [r5, 0x10]\n"
+                    "\tadds r0, 0x2\n"
+                    "\tstrh r0, [r5, 0x10]\n"
+                    "_080887A6:\n"
+                    "\tmovs r0, 0\n"
+                    "_080887A8:\n"
+                    "\tadd sp, 0x4\n"
+                    "\tpop {r3-r5}\n"
+                    "\tmov r8, r3\n"
+                    "\tmov r9, r4\n"
+                    "\tmov r10, r5\n"
+                    "\tpop {r4-r7}\n"
+                    "\tpop {r1}\n"
+                    "\tbx r1\n"
+                    "\t.align 2, 0\n"
+                    "_080887B8: .4byte 0x06000140\n"
+                    "_080887BC: .4byte gDarknessFieldMoveStreaksTilemap");
+}
+#endif
+
+bool8 sub_80887C0(struct Task *task)
+{
+    u16 i;
+    u16 dstOffs;
+    u16 *dest;
+    if (task->data[4] >= 32)
+    {
+        return TRUE;
+    }
+    dstOffs = task->data[3] >> 3;
+    if (dstOffs >= task->data[4])
+    {
+        dstOffs = (task->data[1] >> 3) & 0x1f;
+        dest = (u16 *)(VRAM + 0x140 + (u16)task->data[12]);
+        for (i=0; i<10; i++)
+        {
+            dest[dstOffs + i * 32] = 0xf000;
+            dest[((dstOffs + 1) & 0x1f) + i * 32] = 0xf000;
+        }
+        task->data[4] += 2;
+    }
+    return FALSE;
+}
+
+u8 sub_8088830(u32 a0, u32 a1, u32 a2)
+{
+    u16 v0;
+    u8 monSprite;
+    struct Sprite *sprite;
+    v0 = (a0 & 0x80000000) >> 16;
+    a0 &= 0x7fffffff;
+    monSprite = CreateMonSprite_FieldMove(a0, a1, a2, 0x140, 0x50, 0);
+    sprite = &gSprites[monSprite];
+    sprite->callback = SpriteCallbackDummy;
+    sprite->oam.priority = 0;
+    sprite->data0 = a0;
+    sprite->data6 = v0;
+    return monSprite;
+}
+
+void sub_80888D4(struct Sprite *);
+
+void sub_8088890(struct Sprite *sprite)
+{
+    if ((sprite->pos1.x -= 20) <= 0x78)
+    {
+        sprite->pos1.x = 0x78;
+        sprite->data1 = 30;
+        sprite->callback = sub_80888D4;
+        if (sprite->data6)
+        {
+            PlayCry2(sprite->data0, 0, 0x7d, 0xa);
+        } else
+        {
+            PlayCry1(sprite->data0, 0);
+        }
+    }
+}
+
+void sub_80888F0(struct Sprite *);
+
+void sub_80888D4(struct Sprite *sprite)
+{
+    if ((--sprite->data1) == 0)
+    {
+        sprite->callback = sub_80888F0;
+    }
+}
+
+void sub_80888F0(struct Sprite *sprite)
+{
+    if (sprite->pos1.x < -0x40)
+    {
+        sprite->data7 = 1;
+    } else
+    {
+        sprite->pos1.x -= 20;
+    }
+}