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/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index 3b63d80f84..e41cd36383 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -237,6 +237,7 @@ #define METATILE_General_SecretBase_TreeRight 0x027 #define METATILE_General_SecretBase_VineLeft 0x036 #define METATILE_General_SecretBase_VineRight 0x037 +#define METATILE_General_ShortGrass 0x004 #define METATILE_General_TallGrass 0x00D #define METATILE_General_TallGrass_TreeLeft 0x1C6 #define METATILE_General_TallGrass_TreeRight 0x1C7 diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 2304381673..9298582b25 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; @@ -360,6 +362,7 @@ static void SetCutGrassMetatile(s16 x, s16 y) case METATILE_Fortree_LongGrass_Root: case METATILE_General_LongGrass: case METATILE_General_TallGrass: + case METATILE_General_ShortGrass: MapGridSetMetatileIdAt(x, y, METATILE_General_Grass); break; case METATILE_General_TallGrass_TreeLeft: 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;