FldEff_ShortGrass

2 files changed, 24 insertions, 82 deletions

diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s
index 57fb84368..b21e8db51 100644
--- a/asm/field_effect_helpers.s
+++ b/asm/field_effect_helpers.s
@@ -6,88 +6,6 @@
 
 	.text
 
-	thumb_func_start FldEff_ShortGrass
-FldEff_ShortGrass: @ 8127290
-	push {r4-r6,lr}
-	ldr r6, _08127324 @ =gFieldEffectSpawnParams
-	ldrb r0, [r6]
-	ldrb r1, [r6, 0x4]
-	ldrb r2, [r6, 0x8]
-	bl GetFieldObjectIdByLocalIdAndMap
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 3
-	adds r1, r0
-	lsls r1, 2
-	ldr r0, _08127328 @ =gMapObjects
-	adds r5, r1, r0
-	ldr r0, _0812732C @ =gFieldEffectObjectTemplatePointers
-	ldr r0, [r0, 0x78]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0
-	bl CreateSpriteAtEnd
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x40
-	beq _0812731C
-	lsls r2, r0, 4
-	adds r2, r0
-	lsls r2, 2
-	ldr r4, _08127330 @ =gSprites
-	adds r2, r4
-	adds r3, r2, 0
-	adds r3, 0x3E
-	ldrb r0, [r3]
-	movs r1, 0x2
-	orrs r0, r1
-	strb r0, [r3]
-	ldrb r1, [r5, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	ldrb r0, [r0, 0x5]
-	movs r1, 0xC
-	ands r1, r0
-	ldrb r3, [r2, 0x5]
-	movs r0, 0xD
-	negs r0, r0
-	ands r0, r3
-	orrs r0, r1
-	strb r0, [r2, 0x5]
-	ldr r0, [r6]
-	strh r0, [r2, 0x2E]
-	ldr r0, [r6, 0x4]
-	strh r0, [r2, 0x30]
-	ldr r0, [r6, 0x8]
-	strh r0, [r2, 0x32]
-	ldrb r1, [r5, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	ldrh r0, [r0, 0x20]
-	strh r0, [r2, 0x34]
-	ldrb r1, [r5, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	ldrh r0, [r0, 0x22]
-	strh r0, [r2, 0x36]
-_0812731C:
-	movs r0, 0
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08127324: .4byte gFieldEffectSpawnParams
-_08127328: .4byte gMapObjects
-_0812732C: .4byte gFieldEffectObjectTemplatePointers
-_08127330: .4byte gSprites
-	thumb_func_end FldEff_ShortGrass
-
 	thumb_func_start sub_8127334
 sub_8127334: @ 8127334
 	push {r4-r7,lr}
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index 87cf29b4c..c2cc19a71 100644
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -481,3 +481,27 @@ bool8 FldEff_JumpLongGrass(void)
     }
     return FALSE;
 }
+
+bool8 FldEff_ShortGrass(void)
+{
+    u8 mapObjectId;
+    struct MapObject *mapObject;
+    u8 spriteId;
+    struct Sprite *sprite;
+
+    mapObjectId = GetFieldObjectIdByLocalIdAndMap(gFieldEffectSpawnParams[0], gFieldEffectSpawnParams[1], gFieldEffectSpawnParams[2]);
+    mapObject = &gMapObjects[mapObjectId];
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[30], 0, 0, 0);
+    if (spriteId != MAX_SPRITES)
+    {
+        sprite = &(gSprites[spriteId]);
+        sprite->coordOffsetEnabled = TRUE;
+        sprite->oam.priority = gSprites[mapObject->spriteId].oam.priority;
+        sprite->data0 = gFieldEffectSpawnParams[0];
+        sprite->data1 = gFieldEffectSpawnParams[1];
+        sprite->data2 = gFieldEffectSpawnParams[2];
+        sprite->data3 = gSprites[mapObject->spriteId].pos1.x;
+        sprite->data4 = gSprites[mapObject->spriteId].pos1.y;
+    }
+    return FALSE;
+}