ash field effect callbacks

2 files changed, 37 insertions, 118 deletions

diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s
index f6b7d6c6e..db7893537 100644
--- a/asm/field_effect_helpers.s
+++ b/asm/field_effect_helpers.s
@@ -6,121 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_8127D84
-sub_8127D84: @ 8127D84
-	push {lr}
-	ldr r2, _08127D9C @ =gUnknown_08401E48
-	movs r3, 0x2E
-	ldrsh r1, [r0, r3]
-	lsls r1, 2
-	adds r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08127D9C: .4byte gUnknown_08401E48
-	thumb_func_end sub_8127D84
-
-	thumb_func_start sub_8127DA0
-sub_8127DA0: @ 8127DA0
-	push {lr}
-	adds r3, r0, 0
-	adds r2, r3, 0
-	adds r2, 0x3E
-	ldrb r0, [r2]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r2]
-	subs r2, 0x12
-	ldrb r0, [r2]
-	movs r1, 0x40
-	orrs r0, r1
-	strb r0, [r2]
-	ldrh r0, [r3, 0x36]
-	subs r0, 0x1
-	strh r0, [r3, 0x36]
-	lsls r0, 16
-	cmp r0, 0
-	bne _08127DCA
-	movs r0, 0x1
-	strh r0, [r3, 0x2E]
-_08127DCA:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8127DA0
-
-	thumb_func_start sub_8127DD0
-sub_8127DD0: @ 8127DD0
-	push {r4,lr}
-	adds r4, r0, 0
-	adds r2, r4, 0
-	adds r2, 0x3E
-	ldrb r1, [r2]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r2]
-	subs r2, 0x12
-	ldrb r1, [r2]
-	movs r0, 0x41
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r2]
-	movs r1, 0x30
-	ldrsh r0, [r4, r1]
-	movs r2, 0x32
-	ldrsh r1, [r4, r2]
-	ldrh r2, [r4, 0x34]
-	bl MapGridSetMetatileIdAt
-	movs r1, 0x30
-	ldrsh r0, [r4, r1]
-	movs r2, 0x32
-	ldrsh r1, [r4, r2]
-	bl CurrentMapDrawMetatileAt
-	ldr r2, _08127E28 @ =gMapObjects
-	ldr r0, _08127E2C @ =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r1, [r0]
-	movs r2, 0x4
-	orrs r1, r2
-	strb r1, [r0]
-	movs r0, 0x2
-	strh r0, [r4, 0x2E]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08127E28: .4byte gMapObjects
-_08127E2C: .4byte gPlayerAvatar
-	thumb_func_end sub_8127DD0
-
-	thumb_func_start sub_8127E30
-sub_8127E30: @ 8127E30
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r1, 0
-	bl sub_806487C
-	adds r0, r4, 0
-	adds r0, 0x3F
-	ldrb r1, [r0]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _08127E50
-	adds r0, r4, 0
-	movs r1, 0x7
-	bl FieldEffectStop
-_08127E50:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8127E30
-
 	thumb_func_start FldEff_SurfBlob
 FldEff_SurfBlob: @ 8127E58
 	push {r4,r5,lr}
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index 3d3658b0f..0e8b6e8d3 100644
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -29,9 +29,9 @@ static void npc_pal_op_A(struct MapObject *, u8);
 static void npc_pal_op_B(struct MapObject *, u8);
 static void sub_81275A0(struct Sprite *);
 static void sub_81275C4(struct Sprite *);
-/*static*/ void sub_8127DA0(struct Sprite *);
-/*static*/ void sub_8127DD0(struct Sprite *);
-/*static*/ void sub_8127E30(struct Sprite *);
+static void sub_8127DA0(struct Sprite *);
+static void sub_8127DD0(struct Sprite *);
+static void sub_8127E30(struct Sprite *);
 /*static*/ void sub_812882C(struct Sprite *, u8, u8);
 static void sub_81278D8(struct Sprite *);
 
@@ -926,3 +926,37 @@ u8 FldEff_Ash(void)
     }
     return 0;
 }
+
+void sub_8127D84(struct Sprite *sprite)
+{
+    gUnknown_08401E48[sprite->data0](sprite);
+}
+
+static void sub_8127DA0(struct Sprite *sprite)
+{
+    sprite->invisible = TRUE;
+    sprite->animPaused = TRUE;
+    if (--sprite->data4 == 0)
+    {
+        sprite->data0 = 1;
+    }
+}
+
+static void sub_8127DD0(struct Sprite *sprite)
+{
+    sprite->invisible = FALSE;
+    sprite->animPaused = FALSE;
+    MapGridSetMetatileIdAt(sprite->data1, sprite->data2, sprite->data3);
+    CurrentMapDrawMetatileAt(sprite->data1, sprite->data2);
+    gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_2 = TRUE;
+    sprite->data0 = 2;
+}
+
+static void sub_8127E30(struct Sprite *sprite)
+{
+    sub_806487C(sprite, FALSE);
+    if (sprite->animEnded)
+    {
+        FieldEffectStop(sprite, FLDEFF_ASH);
+    }
+}