unc_grass_normal

2 files changed, 46 insertions, 134 deletions

diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s
index 4d88413bf..4b26537a9 100644
--- a/asm/field_effect_helpers.s
+++ b/asm/field_effect_helpers.s
@@ -6,140 +6,6 @@
 
 	.text
 
-	thumb_func_start unc_grass_normal
-unc_grass_normal: @ 8126E7C
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x4
-	adds r5, r0, 0
-	ldrh r0, [r5, 0x38]
-	lsrs r4, r0, 8
-	lsls r0, 24
-	lsrs r7, r0, 24
-	ldr r3, _08126F24 @ =gUnknown_0202E844
-	ldrb r1, [r3]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _08126EC6
-	ldr r2, _08126F28 @ =gSaveBlock1
-	movs r0, 0x5
-	ldrsb r0, [r2, r0]
-	cmp r0, r4
-	bne _08126EAC
-	movs r0, 0x4
-	ldrsb r0, [r2, r0]
-	cmp r0, r7
-	beq _08126EC6
-_08126EAC:
-	ldr r1, [r3, 0x4]
-	ldrh r0, [r5, 0x30]
-	subs r0, r1
-	strh r0, [r5, 0x30]
-	ldr r1, [r3, 0x8]
-	ldrh r0, [r5, 0x32]
-	subs r0, r1
-	strh r0, [r5, 0x32]
-	ldrb r1, [r2, 0x5]
-	lsls r1, 8
-	ldrb r0, [r2, 0x4]
-	orrs r0, r1
-	strh r0, [r5, 0x38]
-_08126EC6:
-	ldrh r0, [r5, 0x34]
-	lsrs r1, r0, 8
-	mov r8, r1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldrh r0, [r5, 0x36]
-	lsls r0, 24
-	lsrs r7, r0, 24
-	movs r2, 0x30
-	ldrsh r0, [r5, r2]
-	movs r2, 0x32
-	ldrsh r1, [r5, r2]
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r6, r0, 24
-	mov r0, r8
-	adds r1, r4, 0
-	adds r2, r7, 0
-	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
-	lsls r0, 24
-	cmp r0, 0
-	bne _08126F1A
-	adds r0, r6, 0
-	bl MetatileBehavior_IsTallGrass
-	lsls r0, 24
-	cmp r0, 0
-	beq _08126F1A
-	movs r1, 0x3C
-	ldrsh r0, [r5, r1]
-	cmp r0, 0
-	beq _08126F2C
-	adds r0, r5, 0
-	adds r0, 0x3F
-	ldrb r1, [r0]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _08126F2C
-_08126F1A:
-	adds r0, r5, 0
-	movs r1, 0x4
-	bl FieldEffectStop
-	b _08126F70
-	.align 2, 0
-_08126F24: .4byte gUnknown_0202E844
-_08126F28: .4byte gSaveBlock1
-_08126F2C:
-	mov r0, sp
-	ldrb r1, [r0]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08126F7C @ =gMapObjects
-	adds r2, r0, r1
-	ldr r0, [r2, 0x10]
-	ldr r1, [r5, 0x30]
-	cmp r0, r1
-	beq _08126F4C
-	ldr r0, [r2, 0x14]
-	cmp r0, r1
-	beq _08126F4C
-	movs r0, 0x1
-	strh r0, [r5, 0x3C]
-_08126F4C:
-	movs r6, 0
-	adds r0, r5, 0
-	adds r0, 0x2B
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08126F5A
-	movs r6, 0x4
-_08126F5A:
-	adds r0, r5, 0
-	movs r1, 0
-	bl sub_806487C
-	ldrh r1, [r5, 0x2E]
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r5, 0
-	adds r2, r6, 0
-	bl sub_812882C
-_08126F70:
-	add sp, 0x4
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08126F7C: .4byte gMapObjects
-	thumb_func_end unc_grass_normal
-
 	thumb_func_start FldEff_JumpTallGrass
 FldEff_JumpTallGrass: @ 8126F80
 	push {r4,lr}
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index 72fd0d554..98e8242aa 100644
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -6,8 +6,11 @@
 // Includes
 #include "global.h"
 #include "sprite.h"
+#include "fieldmap.h"
 #include "metatile_behavior.h"
 #include "field_map_obj.h"
+#include "field_camera.h"
+#include "field_map_obj_helpers.h"
 #include "field_weather.h"
 #include "field_effect.h"
 #include "field_effect_helpers.h"
@@ -26,6 +29,7 @@ static void npc_pal_op_B(struct MapObject *, u8);
 /*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);
 
 // .rodata
 
@@ -312,3 +316,45 @@ bool8 FldEff_TallGrass(void)
     }
     return FALSE;
 }
+
+void unc_grass_normal(struct Sprite *sprite)
+{
+    u8 mapNum;
+    u8 mapGroup;
+    u8 metatileBehavior;
+    u8 localId;
+    u8 mapObjectId;
+    struct MapObject *mapObject;
+    
+    mapNum = sprite->data5 >> 8;
+    mapGroup = sprite->data5;
+    if (gUnknown_0202E844.field_0 && (gSaveBlock1.location.mapNum != mapNum || gSaveBlock1.location.mapGroup != mapGroup))
+    {
+        sprite->data1 -= gUnknown_0202E844.x;
+        sprite->data2 -= gUnknown_0202E844.y;
+        sprite->data5 = ((u8)gSaveBlock1.location.mapNum << 8) | (u8)gSaveBlock1.location.mapGroup;
+    }
+    localId = sprite->data3 >> 8;
+    mapNum = sprite->data3;
+    mapGroup = sprite->data4;
+    metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->data1, sprite->data2);
+    if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId) || !MetatileBehavior_IsTallGrass(metatileBehavior) || (sprite->data7 && sprite->animEnded))
+    {
+        FieldEffectStop(sprite, 4);
+    }
+    else
+    {
+        mapObject = &gMapObjects[mapObjectId];
+        if ((mapObject->coords2.x != sprite->data1 || mapObject->coords2.y != sprite->data2) && (mapObject->coords3.x != sprite->data1 || mapObject->coords3.y != sprite->data2))
+        {
+            sprite->data7 = TRUE;
+        }
+        metatileBehavior = 0;
+        if (sprite->animCmdIndex == 0)
+        {
+            metatileBehavior = 4;
+        }
+        sub_806487C(sprite, 0);
+        sub_812882C(sprite, sprite->data0, metatileBehavior);
+    }
+}