2 files changed, 16 insertions, 72 deletions

diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s
index e0aff9804..5f2523de4 100644
--- a/asm/field_effect_helpers.s
+++ b/asm/field_effect_helpers.s
@@ -6,78 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_81276B4
-sub_81276B4: @ 81276B4
-	push {r4,lr}
-	sub sp, 0x4
-	adds r4, r0, 0
-	adds r0, 0x3F
-	ldrb r1, [r0]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	bne _081276E4
-	ldrh r0, [r4, 0x2E]
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r4, 0x30]
-	lsls r1, 24
-	lsrs r1, 24
-	ldrh r2, [r4, 0x32]
-	lsls r2, 24
-	lsrs r2, 24
-	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
-	lsls r0, 24
-	cmp r0, 0
-	beq _081276EE
-_081276E4:
-	adds r0, r4, 0
-	movs r1, 0xF
-	bl FieldEffectStop
-	b _0812772E
-_081276EE:
-	ldr r3, _08127738 @ =gSprites
-	ldr r2, _0812773C @ =gMapObjects
-	mov r0, sp
-	ldrb r1, [r0]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r1, [r0, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	ldrh r0, [r0, 0x20]
-	strh r0, [r4, 0x20]
-	mov r0, sp
-	ldrb r1, [r0]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r1, [r0, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	ldrh r0, [r0, 0x22]
-	strh r0, [r4, 0x22]
-	adds r0, r4, 0
-	movs r1, 0
-	bl sub_806487C
-_0812772E:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08127738: .4byte gSprites
-_0812773C: .4byte gMapObjects
-	thumb_func_end sub_81276B4
-
 	thumb_func_start FldEff_JumpSmallSplash
 FldEff_JumpSmallSplash: @ 8127740
 	push {r4,lr}
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index 713cda7ae..53c18c158 100644
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -650,3 +650,19 @@ u8 FldEff_Splash(void)
     }
     return 0;
 }
+
+void sub_81276B4(struct Sprite *sprite)
+{
+    u8 mapObjectId;
+
+    if (sprite->animEnded || TryGetFieldObjectIdByLocalIdAndMap(sprite->data0, sprite->data1, sprite->data2, &mapObjectId))
+    {
+        FieldEffectStop(sprite, FLDEFF_SPLASH);
+    }
+    else
+    {
+        sprite->pos1.x = gSprites[gMapObjects[mapObjectId].spriteId].pos1.x;
+        sprite->pos1.y = gSprites[gMapObjects[mapObjectId].spriteId].pos1.y;
+        sub_806487C(sprite, FALSE);
+    }
+}