From 810ca5f8ff79aeec6ffe8e982f4786aade616b4d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 7 Jul 2021 09:11:52 -0400 Subject: Flatten pos fields in struct Sprite --- src/fldeff_cut.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/fldeff_cut.c') diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 044e25a8f..164f9507b 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -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 -- cgit v1.2.3 From f8f7617946e150514313267ba52a35ebd9052936 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 14 Sep 2021 13:14:14 -0400 Subject: Add TAG_NONE --- src/fldeff_cut.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/fldeff_cut.c') diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 164f9507b..daa46ad76 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -125,7 +125,7 @@ const struct SpritePalette gSpritePalette_CutGrass = {gFieldEffectPal_CutGrass, static const struct SpriteTemplate sSpriteTemplate_CutGrass = { - .tileTag = 0xFFFF, + .tileTag = TAG_NONE, .paletteTag = FLDEFF_PAL_TAG_CUT_GRASS, .oam = &sOamData_CutGrass, .anims = sSpriteAnimTable_CutGrass, -- cgit v1.2.3