summaryrefslogtreecommitdiff
path: root/src/fldeff_cut.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-07-31 13:30:40 -0400
committerGitHub <noreply@github.com>2021-07-31 13:30:40 -0400
commit3e60a7840653e50845abf10bb02cd1b519dcd80f (patch)
treecb4a0d227a238ebdeb3b6cb9fdb92781bcc4f5e7 /src/fldeff_cut.c
parent602855ea99d8015ef5b7709f6fb1e9fd167239e2 (diff)
parentd391486247cc9f29d85787d6711f7cb993cf6585 (diff)
Merge branch 'master' into doc-frontierpass2
Diffstat (limited to 'src/fldeff_cut.c')
-rw-r--r--src/fldeff_cut.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index 446633a53..164f9507b 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -326,7 +326,7 @@ bool8 FldEff_CutGrass(void)
y = yAdd + gPlayerFacingPosition.y;
SetCutGrassMetatile(x, y);
- sub_808E75C(x, y);
+ AllowObjectAtPosTriggerGroundEffects(x, y);
}
}
@@ -555,8 +555,8 @@ static void CutGrassSpriteCallback1(struct Sprite *sprite)
static void CutGrassSpriteCallback2(struct Sprite *sprite)
{
- sprite->pos2.x = Sin(sprite->data[2], sprite->data[0]);
- sprite->pos2.y = Cos(sprite->data[2], sprite->data[0]);
+ sprite->x2 = Sin(sprite->data[2], sprite->data[0]);
+ sprite->y2 = Cos(sprite->data[2], sprite->data[0]);
sprite->data[2] = (sprite->data[2] + 8) & 0xFF;
sprite->data[0] += 1 + (sprite->data[3] >> 2); // right shift by 2 is dividing by 4