FldEff_JumpLongGrass

2 files changed, 18 insertions, 57 deletions

diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s
index 74b1343b4..57fb84368 100644
--- a/asm/field_effect_helpers.s
+++ b/asm/field_effect_helpers.s
@@ -6,63 +6,6 @@
 
 	.text
 
-	thumb_func_start FldEff_JumpLongGrass
-FldEff_JumpLongGrass: @ 8127220
-	push {r4,lr}
-	ldr r4, _08127284 @ =gFieldEffectSpawnParams
-	adds r1, r4, 0x4
-	adds r0, r4, 0
-	movs r2, 0x8
-	movs r3, 0x8
-	bl sub_8060470
-	ldr r0, _08127288 @ =gFieldEffectObjectTemplatePointers
-	ldr r0, [r0, 0x40]
-	movs r2, 0
-	ldrsh r1, [r4, r2]
-	movs r3, 0x4
-	ldrsh r2, [r4, r3]
-	movs r3, 0
-	bl CreateSpriteAtEnd
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x40
-	beq _0812727C
-	lsls r2, r0, 4
-	adds r2, r0
-	lsls r2, 2
-	ldr r0, _0812728C @ =gSprites
-	adds r2, r0
-	adds r3, r2, 0
-	adds r3, 0x3E
-	ldrb r0, [r3]
-	movs r1, 0x2
-	orrs r0, r1
-	strb r0, [r3]
-	movs r0, 0x3
-	ldrb r1, [r4, 0xC]
-	ands r1, r0
-	lsls r1, 2
-	ldrb r3, [r2, 0x5]
-	movs r0, 0xD
-	negs r0, r0
-	ands r0, r3
-	orrs r0, r1
-	strb r0, [r2, 0x5]
-	ldr r0, [r4, 0x8]
-	strh r0, [r2, 0x2E]
-	movs r0, 0x12
-	strh r0, [r2, 0x30]
-_0812727C:
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08127284: .4byte gFieldEffectSpawnParams
-_08127288: .4byte gFieldEffectObjectTemplatePointers
-_0812728C: .4byte gSprites
-	thumb_func_end FldEff_JumpLongGrass
-
 	thumb_func_start FldEff_ShortGrass
 FldEff_ShortGrass: @ 8127290
 	push {r4-r6,lr}
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index 599441c3d..87cf29b4c 100644
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -463,3 +463,21 @@ void unc_grass_tall(struct Sprite *sprite)
         sub_812882C(sprite, sprite->data0, 0);
     }
 }
+
+bool8 FldEff_JumpLongGrass(void)
+{
+    u8 spriteId;
+    struct Sprite *sprite;
+
+    sub_8060470((s16 *)&gFieldEffectSpawnParams[0], (s16 *)&gFieldEffectSpawnParams[1], 8, 8);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[16], gFieldEffectSpawnParams[0], gFieldEffectSpawnParams[1], 0);
+    if (spriteId != MAX_SPRITES)
+    {
+        sprite = &gSprites[spriteId];
+        sprite->coordOffsetEnabled = TRUE;
+        sprite->oam.priority = gFieldEffectSpawnParams[3];
+        sprite->data0 = gFieldEffectSpawnParams[2];
+        sprite->data1 = 18;
+    }
+    return FALSE;
+}