diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-03-15 11:29:12 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-03-15 11:29:12 -0400 |
| commit | 090591b71d627a39ef387ee9520e7a70bf05c129 (patch) | |
| tree | 4604218779e2edc53a96a2915fbbca4989de63b0 /src/fieldmap.c | |
| parent | de53dabab2fafa7bad233b0f7f2a12e41cb4734d (diff) | |
Remove unnecessary border tile macro
Diffstat (limited to 'src/fieldmap.c')
| -rw-r--r-- | src/fieldmap.c | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/src/fieldmap.c b/src/fieldmap.c index 57111e208..ccc931a55 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -365,27 +365,7 @@ union Block u16 value; }; -#define MapGridGetBorderTileAt(x, y) ({ \ - u16 block; \ - s32 xprime; \ - s32 yprime; \ - \ - struct MapLayout *mapLayout = gMapHeader.mapLayout; \ - \ - xprime = x - 7; \ - xprime += 8 * mapLayout->borderWidth; \ - xprime %= mapLayout->borderWidth; \ - \ - yprime = y - 7; \ - yprime += 8 * mapLayout->borderHeight; \ - yprime %= mapLayout->borderHeight; \ - \ - block = mapLayout->border[xprime + yprime * mapLayout->borderWidth]; \ - block |= METATILE_COLLISION_MASK; \ - block; \ -}) - -#define MapGridGetBorderTileAt2(x, y) ({ \ +#define MapGridGetBorderTileAt(x, y) ({ \ u16 block; \ s32 xprime; \ s32 yprime; \ @@ -401,12 +381,11 @@ union Block yprime %= mapLayout->borderHeight; \ \ block = mapLayout->border[xprime + yprime * mapLayout->borderWidth] | METATILE_COLLISION_MASK; \ - block; \ }) #define AreCoordsWithinMapGridBounds(x, y) (x >= 0 && x < VMap.Xsize && y >= 0 && y < VMap.Ysize) -#define MapGridGetTileAt(x, y) (AreCoordsWithinMapGridBounds(x, y) ? VMap.map[x + VMap.Xsize * y] : MapGridGetBorderTileAt2(x, y)) +#define MapGridGetTileAt(x, y) (AreCoordsWithinMapGridBounds(x, y) ? VMap.map[x + VMap.Xsize * y] : MapGridGetBorderTileAt(x, y)) u8 MapGridGetZCoordAt(s32 x, s32 y) { |