diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2022-01-19 10:15:32 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2022-01-19 10:15:32 -0500 |
| commit | a8b466dc80eb22146c6bc517d44fdc133a646555 (patch) | |
| tree | 605cf9e43e2e3174bfb8019092259b710b242710 /src/trainer_hill.c | |
| parent | f127e64a3ca2899510622f012bc3823da2c5cd23 (diff) | |
Disambiguate fieldmap names
Diffstat (limited to 'src/trainer_hill.c')
| -rw-r--r-- | src/trainer_hill.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/trainer_hill.c b/src/trainer_hill.c index 3ada262e5..bf988b49a 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -677,9 +677,9 @@ static u16 GetMetatileForFloor(u8 floorId, u32 x, u32 y, u32 stride) // stride i impassable = (sHillData->floors[floorId].display.collisionData[y] >> (15 - x) & 1); metatile = sHillData->floors[floorId].display.metatileData[stride * y + x] + NUM_METATILES_IN_PRIMARY; - elevation = 3 << METATILE_ELEVATION_SHIFT; + elevation = 3 << MAPGRID_ELEVATION_SHIFT; - return ((impassable << METATILE_COLLISION_SHIFT) & METATILE_COLLISION_MASK) | elevation | (metatile & METATILE_ID_MASK); + return ((impassable << MAPGRID_COLLISION_SHIFT) & MAPGRID_COLLISION_MASK) | elevation | (metatile & MAPGRID_METATILE_ID_MASK); } void GenerateTrainerHillFloorLayout(u16 *mapArg) |