diff --git a/data/tilesets/primary/general/metatile_attributes.bin b/data/tilesets/primary/general/metatile_attributes.bin index d9cd29016d..f38e580f14 100644 Binary files a/data/tilesets/primary/general/metatile_attributes.bin and b/data/tilesets/primary/general/metatile_attributes.bin differ diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 2304381673..ed59cf692e 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -185,6 +185,7 @@ bool8 SetUpFieldMove_Cut(void) { tileBehavior = MapGridGetMetatileBehaviorAt(x, y); if (MetatileBehavior_IsPokeGrass(tileBehavior) == TRUE + || MetatileBehavior_IsShortGrass(tileBehavior) == TRUE || MetatileBehavior_IsAshGrass(tileBehavior) == TRUE) { // Standing in front of grass. @@ -248,6 +249,7 @@ bool8 SetUpFieldMove_Cut(void) u8 tileArrayId = ((sHyperCutStruct[i].y * 5) + 12) + (sHyperCutStruct[i].x); tileBehavior = MapGridGetMetatileBehaviorAt(x, y); if (MetatileBehavior_IsPokeGrass(tileBehavior) == TRUE + || MetatileBehavior_IsShortGrass(tileBehavior) == TRUE || MetatileBehavior_IsAshGrass(tileBehavior) == TRUE) { gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c index 924428aea4..37a9badccf 100644 --- a/src/metatile_behavior.c +++ b/src/metatile_behavior.c @@ -13,7 +13,7 @@ static const u8 sTileBitAttributes[NUM_METATILE_BEHAVIORS] = [MB_LONG_GRASS] = TILE_FLAG_UNUSED | TILE_FLAG_HAS_ENCOUNTERS, [MB_UNUSED_05] = TILE_FLAG_HAS_ENCOUNTERS, [MB_DEEP_SAND] = TILE_FLAG_UNUSED | TILE_FLAG_HAS_ENCOUNTERS, - [MB_SHORT_GRASS] = TILE_FLAG_UNUSED, + [MB_SHORT_GRASS] = TILE_FLAG_UNUSED | TILE_FLAG_HAS_ENCOUNTERS, [MB_CAVE] = TILE_FLAG_UNUSED | TILE_FLAG_HAS_ENCOUNTERS, [MB_LONG_GRASS_SOUTH_EDGE] = TILE_FLAG_UNUSED, [MB_NO_RUNNING] = TILE_FLAG_UNUSED, @@ -1270,6 +1270,7 @@ bool8 MetatileBehavior_IsCuttableGrass(u8 metatileBehavior) { if (metatileBehavior == MB_TALL_GRASS || metatileBehavior == MB_LONG_GRASS + || metatileBehavior == MB_SHORT_GRASS || metatileBehavior == MB_ASHGRASS || metatileBehavior == MB_LONG_GRASS_SOUTH_EDGE) return TRUE;