From 6ca5e691bf555cce48719ce666c087dbc86fd28d Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Sun, 10 Sep 2017 12:28:51 -0400
Subject: sub_81287C4

---
 asm/field_effect_helpers.s | 32 --------------------------------
 src/field_effect_helpers.c | 13 +++++++++++++
 2 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s
index 823f80dda..df3610f42 100644
--- a/asm/field_effect_helpers.s
+++ b/asm/field_effect_helpers.s
@@ -6,38 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_81287C4
-sub_81287C4: @ 81287C4
-	push {r4,lr}
-	adds r4, r0, 0
-	adds r0, 0x3F
-	ldrb r1, [r0]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _081287E2
-	ldrh r1, [r4, 0x30]
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl FieldEffectStop
-	b _081287F8
-_081287E2:
-	adds r0, r4, 0
-	movs r1, 0
-	bl sub_806487C
-	ldrh r0, [r4, 0x2E]
-	lsls r0, 24
-	lsrs r0, 24
-	adds r1, r4, 0
-	movs r2, 0
-	bl SetObjectSubpriorityByZCoord
-_081287F8:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_81287C4
-
 	thumb_func_start sub_8128800
 sub_8128800: @ 8128800
 	push {lr}
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index a84746a04..793bef3e2 100644
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -1470,3 +1470,16 @@ void sub_8128774(struct Sprite *sprite)
         FieldEffectStop(sprite, FLDEFF_SPARKLE);
     }
 }
+
+void sub_81287C4(struct Sprite *sprite)
+{
+    if (sprite->animEnded)
+    {
+        FieldEffectStop(sprite, sprite->data1);
+    }
+    else
+    {
+        sub_806487C(sprite, FALSE);
+        SetObjectSubpriorityByZCoord(sprite->data0, sprite, 0);
+    }
+}
-- 
cgit v1.2.3