Skip to content

Commit

Permalink
TRAVERSABLE->UNUSED, rename MB_SECRET_BASE_OBSTACLE
Browse files Browse the repository at this point in the history
  • Loading branch information
@GriffinRichards
GriffinRichards committed Jan 19, 2022
1 parent e682c12 commit c4f33f2
Show file tree
Hide file tree
Showing 2 changed files with 122 additions and 122 deletions.
2 changes: 1 addition & 1 deletion include/constants/metatile_behaviors.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
#define MB_UNUSED_AF 0xAF
#define MB_SECRET_BASE_PC 0xB0
#define MB_SECRET_BASE_REGISTER_PC 0xB1
#define MB_SECRET_BASE_OBSTACLE 0xB2
#define MB_SECRET_BASE_SCENERY 0xB2
#define MB_SECRET_BASE_TRAINER_SPOT 0xB3
#define MB_SECRET_BASE_DECORATION 0xB4
#define MB_HOLDS_SMALL_DECORATION 0xB5
Expand Down
242 changes: 121 additions & 121 deletions src/metatile_behavior.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,127 +4,127 @@

#define TILE_FLAG_HAS_ENCOUNTERS (1 << 0)
#define TILE_FLAG_SURFABLE (1 << 1)
#define TILE_FLAG_TRAVERSABLE (1 << 2) // Set but never read
#define TILE_FLAG_UNUSED (1 << 2) // Roughly all of the traversable metatiles. Set but never read

static const u8 sTileBitAttributes[NUM_METATILE_BEHAVIORS] =
{
[MB_NORMAL] = TILE_FLAG_TRAVERSABLE,
[MB_TALL_GRASS] = TILE_FLAG_TRAVERSABLE | TILE_FLAG_HAS_ENCOUNTERS,
[MB_LONG_GRASS] = TILE_FLAG_TRAVERSABLE | TILE_FLAG_HAS_ENCOUNTERS,
[MB_NORMAL] = TILE_FLAG_UNUSED,
[MB_TALL_GRASS] = TILE_FLAG_UNUSED | TILE_FLAG_HAS_ENCOUNTERS,
[MB_LONG_GRASS] = TILE_FLAG_UNUSED | TILE_FLAG_HAS_ENCOUNTERS,
[MB_UNUSED_05] = TILE_FLAG_HAS_ENCOUNTERS,
[MB_DEEP_SAND] = TILE_FLAG_TRAVERSABLE | TILE_FLAG_HAS_ENCOUNTERS,
[MB_SHORT_GRASS] = TILE_FLAG_TRAVERSABLE,
[MB_CAVE] = TILE_FLAG_TRAVERSABLE | TILE_FLAG_HAS_ENCOUNTERS,
[MB_LONG_GRASS_SOUTH_EDGE] = TILE_FLAG_TRAVERSABLE,
[MB_NO_RUNNING] = TILE_FLAG_TRAVERSABLE,
[MB_INDOOR_ENCOUNTER] = TILE_FLAG_TRAVERSABLE | TILE_FLAG_HAS_ENCOUNTERS,
[MB_MOUNTAIN_TOP] = TILE_FLAG_TRAVERSABLE,
[MB_BATTLE_PYRAMID_WARP] = TILE_FLAG_TRAVERSABLE,
[MB_MOSSDEEP_GYM_WARP] = TILE_FLAG_TRAVERSABLE,
[MB_MT_PYRE_HOLE] = TILE_FLAG_TRAVERSABLE,
[MB_POND_WATER] = TILE_FLAG_TRAVERSABLE | TILE_FLAG_SURFABLE | TILE_FLAG_HAS_ENCOUNTERS,
[MB_SEMI_DEEP_WATER] = TILE_FLAG_TRAVERSABLE | TILE_FLAG_SURFABLE | TILE_FLAG_HAS_ENCOUNTERS,
[MB_DEEP_WATER] = TILE_FLAG_TRAVERSABLE | TILE_FLAG_SURFABLE | TILE_FLAG_HAS_ENCOUNTERS,
[MB_WATERFALL] = TILE_FLAG_TRAVERSABLE | TILE_FLAG_SURFABLE,
[MB_SOOTOPOLIS_DEEP_WATER] = TILE_FLAG_TRAVERSABLE | TILE_FLAG_SURFABLE,
[MB_OCEAN_WATER] = TILE_FLAG_TRAVERSABLE | TILE_FLAG_SURFABLE | TILE_FLAG_HAS_ENCOUNTERS,
[MB_PUDDLE] = TILE_FLAG_TRAVERSABLE,
[MB_SHALLOW_WATER] = TILE_FLAG_TRAVERSABLE,
[MB_NO_SURFACING] = TILE_FLAG_TRAVERSABLE | TILE_FLAG_SURFABLE,
[MB_STAIRS_OUTSIDE_ABANDONED_SHIP] = TILE_FLAG_TRAVERSABLE,
[MB_SHOAL_CAVE_ENTRANCE] = TILE_FLAG_TRAVERSABLE,
[MB_ICE] = TILE_FLAG_TRAVERSABLE,
[MB_SAND] = TILE_FLAG_TRAVERSABLE,
[MB_SEAWEED] = TILE_FLAG_TRAVERSABLE | TILE_FLAG_SURFABLE | TILE_FLAG_HAS_ENCOUNTERS,
[MB_UNUSED_23] = TILE_FLAG_TRAVERSABLE,
[MB_ASHGRASS] = TILE_FLAG_TRAVERSABLE | TILE_FLAG_HAS_ENCOUNTERS,
[MB_FOOTPRINTS] = TILE_FLAG_TRAVERSABLE | TILE_FLAG_HAS_ENCOUNTERS,
[MB_THIN_ICE] = TILE_FLAG_TRAVERSABLE,
[MB_CRACKED_ICE] = TILE_FLAG_TRAVERSABLE,
[MB_HOT_SPRINGS] = TILE_FLAG_TRAVERSABLE,
[MB_LAVARIDGE_GYM_B1F_WARP] = TILE_FLAG_TRAVERSABLE,
[MB_SEAWEED_NO_SURFACING] = TILE_FLAG_TRAVERSABLE | TILE_FLAG_SURFABLE | TILE_FLAG_HAS_ENCOUNTERS,
[MB_REFLECTION_UNDER_BRIDGE] = TILE_FLAG_TRAVERSABLE,
[MB_IMPASSABLE_EAST] = TILE_FLAG_TRAVERSABLE,
[MB_IMPASSABLE_WEST] = TILE_FLAG_TRAVERSABLE,
[MB_IMPASSABLE_NORTH] = TILE_FLAG_TRAVERSABLE,
[MB_IMPASSABLE_SOUTH] = TILE_FLAG_TRAVERSABLE,
[MB_IMPASSABLE_NORTHEAST] = TILE_FLAG_TRAVERSABLE,
[MB_IMPASSABLE_NORTHWEST] = TILE_FLAG_TRAVERSABLE,
[MB_IMPASSABLE_SOUTHEAST] = TILE_FLAG_TRAVERSABLE,
[MB_IMPASSABLE_SOUTHWEST] = TILE_FLAG_TRAVERSABLE,
[MB_JUMP_NORTHEAST] = TILE_FLAG_TRAVERSABLE,
[MB_JUMP_NORTHWEST] = TILE_FLAG_TRAVERSABLE,
[MB_JUMP_SOUTHEAST] = TILE_FLAG_TRAVERSABLE,
[MB_JUMP_SOUTHWEST] = TILE_FLAG_TRAVERSABLE,
[MB_WALK_EAST] = TILE_FLAG_TRAVERSABLE,
[MB_WALK_WEST] = TILE_FLAG_TRAVERSABLE,
[MB_WALK_NORTH] = TILE_FLAG_TRAVERSABLE,
[MB_WALK_SOUTH] = TILE_FLAG_TRAVERSABLE,
[MB_SLIDE_EAST] = TILE_FLAG_TRAVERSABLE,
[MB_SLIDE_WEST] = TILE_FLAG_TRAVERSABLE,
[MB_SLIDE_NORTH] = TILE_FLAG_TRAVERSABLE,
[MB_SLIDE_SOUTH] = TILE_FLAG_TRAVERSABLE,
[MB_TRICK_HOUSE_PUZZLE_8_FLOOR] = TILE_FLAG_TRAVERSABLE,
[MB_UNUSED_49] = TILE_FLAG_TRAVERSABLE,
[MB_UNUSED_4A] = TILE_FLAG_TRAVERSABLE,
[MB_EASTWARD_CURRENT] = TILE_FLAG_TRAVERSABLE | TILE_FLAG_SURFABLE,
[MB_WESTWARD_CURRENT] = TILE_FLAG_TRAVERSABLE | TILE_FLAG_SURFABLE,
[MB_NORTHWARD_CURRENT] = TILE_FLAG_TRAVERSABLE | TILE_FLAG_SURFABLE,
[MB_SOUTHWARD_CURRENT] = TILE_FLAG_TRAVERSABLE | TILE_FLAG_SURFABLE,
[MB_NON_ANIMATED_DOOR] = TILE_FLAG_TRAVERSABLE,
[MB_LADDER] = TILE_FLAG_TRAVERSABLE,
[MB_EAST_ARROW_WARP] = TILE_FLAG_TRAVERSABLE,
[MB_WEST_ARROW_WARP] = TILE_FLAG_TRAVERSABLE,
[MB_NORTH_ARROW_WARP] = TILE_FLAG_TRAVERSABLE,
[MB_SOUTH_ARROW_WARP] = TILE_FLAG_TRAVERSABLE,
[MB_CRACKED_FLOOR_HOLE] = TILE_FLAG_TRAVERSABLE,
[MB_AQUA_HIDEOUT_WARP] = TILE_FLAG_TRAVERSABLE,
[MB_LAVARIDGE_GYM_1F_WARP] = TILE_FLAG_TRAVERSABLE,
[MB_ANIMATED_DOOR] = TILE_FLAG_TRAVERSABLE,
[MB_UP_ESCALATOR] = TILE_FLAG_TRAVERSABLE,
[MB_DOWN_ESCALATOR] = TILE_FLAG_TRAVERSABLE,
[MB_WATER_DOOR] = TILE_FLAG_TRAVERSABLE | TILE_FLAG_SURFABLE,
[MB_WATER_SOUTH_ARROW_WARP] = TILE_FLAG_TRAVERSABLE | TILE_FLAG_SURFABLE,
[MB_DEEP_SOUTH_WARP] = TILE_FLAG_TRAVERSABLE,
[MB_UNUSED_6F] = TILE_FLAG_TRAVERSABLE | TILE_FLAG_SURFABLE,
[MB_BRIDGE_OVER_POND_LOW] = TILE_FLAG_TRAVERSABLE,
[MB_BRIDGE_OVER_POND_MED] = TILE_FLAG_TRAVERSABLE,
[MB_BRIDGE_OVER_POND_HIGH] = TILE_FLAG_TRAVERSABLE,
[MB_PACIFIDLOG_VERTICAL_LOG_TOP] = TILE_FLAG_TRAVERSABLE,
[MB_PACIFIDLOG_VERTICAL_LOG_BOTTOM] = TILE_FLAG_TRAVERSABLE,
[MB_PACIFIDLOG_HORIZONTAL_LOG_LEFT] = TILE_FLAG_TRAVERSABLE,
[MB_PACIFIDLOG_HORIZONTAL_LOG_RIGHT] = TILE_FLAG_TRAVERSABLE,
[MB_FORTREE_BRIDGE] = TILE_FLAG_TRAVERSABLE,
[MB_BRIDGE_OVER_POND_MED_EDGE_1] = TILE_FLAG_TRAVERSABLE,
[MB_BRIDGE_OVER_POND_MED_EDGE_2] = TILE_FLAG_TRAVERSABLE,
[MB_BRIDGE_OVER_POND_HIGH_EDGE_1] = TILE_FLAG_TRAVERSABLE,
[MB_BRIDGE_OVER_POND_HIGH_EDGE_2] = TILE_FLAG_TRAVERSABLE,
[MB_UNUSED_BRIDGE] = TILE_FLAG_TRAVERSABLE,
[MB_BIKE_BRIDGE_OVER_BARRIER] = TILE_FLAG_TRAVERSABLE,
[MB_SECRET_BASE_OBSTACLE] = TILE_FLAG_TRAVERSABLE,
[MB_SECRET_BASE_TRAINER_SPOT] = TILE_FLAG_TRAVERSABLE,
[MB_HOLDS_SMALL_DECORATION] = TILE_FLAG_TRAVERSABLE,
[MB_SECRET_BASE_BALLOON] = TILE_FLAG_TRAVERSABLE,
[MB_SECRET_BASE_IMPASSABLE] = TILE_FLAG_TRAVERSABLE,
[MB_SECRET_BASE_GLITTER_MAT] = TILE_FLAG_TRAVERSABLE,
[MB_SECRET_BASE_JUMP_MAT] = TILE_FLAG_TRAVERSABLE,
[MB_SECRET_BASE_SPIN_MAT] = TILE_FLAG_TRAVERSABLE,
[MB_SECRET_BASE_SOUND_MAT] = TILE_FLAG_TRAVERSABLE,
[MB_SECRET_BASE_BREAKABLE_DOOR] = TILE_FLAG_TRAVERSABLE,
[MB_IMPASSABLE_SOUTH_AND_NORTH] = TILE_FLAG_TRAVERSABLE,
[MB_IMPASSABLE_WEST_AND_EAST] = TILE_FLAG_TRAVERSABLE,
[MB_SECRET_BASE_HOLE] = TILE_FLAG_TRAVERSABLE,
[MB_HOLDS_LARGE_DECORATION] = TILE_FLAG_TRAVERSABLE,
[MB_SECRET_BASE_TV_SHIELD] = TILE_FLAG_TRAVERSABLE,
[MB_PLAYER_ROOM_PC_ON] = TILE_FLAG_TRAVERSABLE,
[MB_MUDDY_SLOPE] = TILE_FLAG_TRAVERSABLE,
[MB_BUMPY_SLOPE] = TILE_FLAG_TRAVERSABLE,
[MB_CRACKED_FLOOR] = TILE_FLAG_TRAVERSABLE,
[MB_ISOLATED_VERTICAL_RAIL] = TILE_FLAG_TRAVERSABLE,
[MB_ISOLATED_HORIZONTAL_RAIL] = TILE_FLAG_TRAVERSABLE,
[MB_VERTICAL_RAIL] = TILE_FLAG_TRAVERSABLE,
[MB_HORIZONTAL_RAIL] = TILE_FLAG_TRAVERSABLE,
[MB_DEEP_SAND] = TILE_FLAG_UNUSED | TILE_FLAG_HAS_ENCOUNTERS,
[MB_SHORT_GRASS] = TILE_FLAG_UNUSED,
[MB_CAVE] = TILE_FLAG_UNUSED | TILE_FLAG_HAS_ENCOUNTERS,
[MB_LONG_GRASS_SOUTH_EDGE] = TILE_FLAG_UNUSED,
[MB_NO_RUNNING] = TILE_FLAG_UNUSED,
[MB_INDOOR_ENCOUNTER] = TILE_FLAG_UNUSED | TILE_FLAG_HAS_ENCOUNTERS,
[MB_MOUNTAIN_TOP] = TILE_FLAG_UNUSED,
[MB_BATTLE_PYRAMID_WARP] = TILE_FLAG_UNUSED,
[MB_MOSSDEEP_GYM_WARP] = TILE_FLAG_UNUSED,
[MB_MT_PYRE_HOLE] = TILE_FLAG_UNUSED,
[MB_POND_WATER] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE | TILE_FLAG_HAS_ENCOUNTERS,
[MB_SEMI_DEEP_WATER] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE | TILE_FLAG_HAS_ENCOUNTERS,
[MB_DEEP_WATER] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE | TILE_FLAG_HAS_ENCOUNTERS,
[MB_WATERFALL] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE,
[MB_SOOTOPOLIS_DEEP_WATER] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE,
[MB_OCEAN_WATER] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE | TILE_FLAG_HAS_ENCOUNTERS,
[MB_PUDDLE] = TILE_FLAG_UNUSED,
[MB_SHALLOW_WATER] = TILE_FLAG_UNUSED,
[MB_NO_SURFACING] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE,
[MB_STAIRS_OUTSIDE_ABANDONED_SHIP] = TILE_FLAG_UNUSED,
[MB_SHOAL_CAVE_ENTRANCE] = TILE_FLAG_UNUSED,
[MB_ICE] = TILE_FLAG_UNUSED,
[MB_SAND] = TILE_FLAG_UNUSED,
[MB_SEAWEED] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE | TILE_FLAG_HAS_ENCOUNTERS,
[MB_UNUSED_23] = TILE_FLAG_UNUSED,
[MB_ASHGRASS] = TILE_FLAG_UNUSED | TILE_FLAG_HAS_ENCOUNTERS,
[MB_FOOTPRINTS] = TILE_FLAG_UNUSED | TILE_FLAG_HAS_ENCOUNTERS,
[MB_THIN_ICE] = TILE_FLAG_UNUSED,
[MB_CRACKED_ICE] = TILE_FLAG_UNUSED,
[MB_HOT_SPRINGS] = TILE_FLAG_UNUSED,
[MB_LAVARIDGE_GYM_B1F_WARP] = TILE_FLAG_UNUSED,
[MB_SEAWEED_NO_SURFACING] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE | TILE_FLAG_HAS_ENCOUNTERS,
[MB_REFLECTION_UNDER_BRIDGE] = TILE_FLAG_UNUSED,
[MB_IMPASSABLE_EAST] = TILE_FLAG_UNUSED,
[MB_IMPASSABLE_WEST] = TILE_FLAG_UNUSED,
[MB_IMPASSABLE_NORTH] = TILE_FLAG_UNUSED,
[MB_IMPASSABLE_SOUTH] = TILE_FLAG_UNUSED,
[MB_IMPASSABLE_NORTHEAST] = TILE_FLAG_UNUSED,
[MB_IMPASSABLE_NORTHWEST] = TILE_FLAG_UNUSED,
[MB_IMPASSABLE_SOUTHEAST] = TILE_FLAG_UNUSED,
[MB_IMPASSABLE_SOUTHWEST] = TILE_FLAG_UNUSED,
[MB_JUMP_NORTHEAST] = TILE_FLAG_UNUSED,
[MB_JUMP_NORTHWEST] = TILE_FLAG_UNUSED,
[MB_JUMP_SOUTHEAST] = TILE_FLAG_UNUSED,
[MB_JUMP_SOUTHWEST] = TILE_FLAG_UNUSED,
[MB_WALK_EAST] = TILE_FLAG_UNUSED,
[MB_WALK_WEST] = TILE_FLAG_UNUSED,
[MB_WALK_NORTH] = TILE_FLAG_UNUSED,
[MB_WALK_SOUTH] = TILE_FLAG_UNUSED,
[MB_SLIDE_EAST] = TILE_FLAG_UNUSED,
[MB_SLIDE_WEST] = TILE_FLAG_UNUSED,
[MB_SLIDE_NORTH] = TILE_FLAG_UNUSED,
[MB_SLIDE_SOUTH] = TILE_FLAG_UNUSED,
[MB_TRICK_HOUSE_PUZZLE_8_FLOOR] = TILE_FLAG_UNUSED,
[MB_UNUSED_49] = TILE_FLAG_UNUSED,
[MB_UNUSED_4A] = TILE_FLAG_UNUSED,
[MB_EASTWARD_CURRENT] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE,
[MB_WESTWARD_CURRENT] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE,
[MB_NORTHWARD_CURRENT] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE,
[MB_SOUTHWARD_CURRENT] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE,
[MB_NON_ANIMATED_DOOR] = TILE_FLAG_UNUSED,
[MB_LADDER] = TILE_FLAG_UNUSED,
[MB_EAST_ARROW_WARP] = TILE_FLAG_UNUSED,
[MB_WEST_ARROW_WARP] = TILE_FLAG_UNUSED,
[MB_NORTH_ARROW_WARP] = TILE_FLAG_UNUSED,
[MB_SOUTH_ARROW_WARP] = TILE_FLAG_UNUSED,
[MB_CRACKED_FLOOR_HOLE] = TILE_FLAG_UNUSED,
[MB_AQUA_HIDEOUT_WARP] = TILE_FLAG_UNUSED,
[MB_LAVARIDGE_GYM_1F_WARP] = TILE_FLAG_UNUSED,
[MB_ANIMATED_DOOR] = TILE_FLAG_UNUSED,
[MB_UP_ESCALATOR] = TILE_FLAG_UNUSED,
[MB_DOWN_ESCALATOR] = TILE_FLAG_UNUSED,
[MB_WATER_DOOR] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE,
[MB_WATER_SOUTH_ARROW_WARP] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE,
[MB_DEEP_SOUTH_WARP] = TILE_FLAG_UNUSED,
[MB_UNUSED_6F] = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE,
[MB_BRIDGE_OVER_POND_LOW] = TILE_FLAG_UNUSED,
[MB_BRIDGE_OVER_POND_MED] = TILE_FLAG_UNUSED,
[MB_BRIDGE_OVER_POND_HIGH] = TILE_FLAG_UNUSED,
[MB_PACIFIDLOG_VERTICAL_LOG_TOP] = TILE_FLAG_UNUSED,
[MB_PACIFIDLOG_VERTICAL_LOG_BOTTOM] = TILE_FLAG_UNUSED,
[MB_PACIFIDLOG_HORIZONTAL_LOG_LEFT] = TILE_FLAG_UNUSED,
[MB_PACIFIDLOG_HORIZONTAL_LOG_RIGHT] = TILE_FLAG_UNUSED,
[MB_FORTREE_BRIDGE] = TILE_FLAG_UNUSED,
[MB_BRIDGE_OVER_POND_MED_EDGE_1] = TILE_FLAG_UNUSED,
[MB_BRIDGE_OVER_POND_MED_EDGE_2] = TILE_FLAG_UNUSED,
[MB_BRIDGE_OVER_POND_HIGH_EDGE_1] = TILE_FLAG_UNUSED,
[MB_BRIDGE_OVER_POND_HIGH_EDGE_2] = TILE_FLAG_UNUSED,
[MB_UNUSED_BRIDGE] = TILE_FLAG_UNUSED,
[MB_BIKE_BRIDGE_OVER_BARRIER] = TILE_FLAG_UNUSED,
[MB_SECRET_BASE_SCENERY] = TILE_FLAG_UNUSED,
[MB_SECRET_BASE_TRAINER_SPOT] = TILE_FLAG_UNUSED,
[MB_HOLDS_SMALL_DECORATION] = TILE_FLAG_UNUSED,
[MB_SECRET_BASE_BALLOON] = TILE_FLAG_UNUSED,
[MB_SECRET_BASE_IMPASSABLE] = TILE_FLAG_UNUSED,
[MB_SECRET_BASE_GLITTER_MAT] = TILE_FLAG_UNUSED,
[MB_SECRET_BASE_JUMP_MAT] = TILE_FLAG_UNUSED,
[MB_SECRET_BASE_SPIN_MAT] = TILE_FLAG_UNUSED,
[MB_SECRET_BASE_SOUND_MAT] = TILE_FLAG_UNUSED,
[MB_SECRET_BASE_BREAKABLE_DOOR] = TILE_FLAG_UNUSED,
[MB_IMPASSABLE_SOUTH_AND_NORTH] = TILE_FLAG_UNUSED,
[MB_IMPASSABLE_WEST_AND_EAST] = TILE_FLAG_UNUSED,
[MB_SECRET_BASE_HOLE] = TILE_FLAG_UNUSED,
[MB_HOLDS_LARGE_DECORATION] = TILE_FLAG_UNUSED,
[MB_SECRET_BASE_TV_SHIELD] = TILE_FLAG_UNUSED,
[MB_PLAYER_ROOM_PC_ON] = TILE_FLAG_UNUSED,
[MB_MUDDY_SLOPE] = TILE_FLAG_UNUSED,
[MB_BUMPY_SLOPE] = TILE_FLAG_UNUSED,
[MB_CRACKED_FLOOR] = TILE_FLAG_UNUSED,
[MB_ISOLATED_VERTICAL_RAIL] = TILE_FLAG_UNUSED,
[MB_ISOLATED_HORIZONTAL_RAIL] = TILE_FLAG_UNUSED,
[MB_VERTICAL_RAIL] = TILE_FLAG_UNUSED,
[MB_HORIZONTAL_RAIL] = TILE_FLAG_UNUSED,
};

bool8 MetatileBehavior_IsATile(u8 metatileBehavior)
Expand Down Expand Up @@ -563,9 +563,9 @@ bool8 MetatileBehavior_IsRecordMixingSecretBasePC(u8 metatileBehavior)
}

// Used by the rock/grass floor spaces that the secret base trainer is not standing on
bool8 MetatileBehavior_IsSecretBaseObstacle1(u8 metatileBehavior)
bool8 MetatileBehavior_IsSecretBaseScenery1(u8 metatileBehavior)
{
if (metatileBehavior == MB_SECRET_BASE_OBSTACLE)
if (metatileBehavior == MB_SECRET_BASE_SCENERY)
return TRUE;
else
return FALSE;
Expand Down Expand Up @@ -620,9 +620,9 @@ bool8 MetatileBehavior_IsSecretBaseNorthWall(u8 metatileBehavior)
return FALSE;
}

bool8 MetatileBehavior_IsSecretBaseObstacle2(u8 metatileBehavior)
bool8 MetatileBehavior_IsSecretBaseScenery2(u8 metatileBehavior)
{
if (metatileBehavior == MB_SECRET_BASE_OBSTACLE)
if (metatileBehavior == MB_SECRET_BASE_SCENERY)
return TRUE;
else
return FALSE;
Expand Down

0 comments on commit c4f33f2

Please sign in to comment.