From de53dabab2fafa7bad233b0f7f2a12e41cb4734d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 15 Mar 2020 01:24:31 -0400 Subject: Label border dimension fields --- src/fieldmap.c | 70 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) (limited to 'src/fieldmap.c') diff --git a/src/fieldmap.c b/src/fieldmap.c index d7fe28c84..57111e208 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -365,43 +365,43 @@ 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->unk18; \ - xprime %= mapLayout->unk18; \ - \ - yprime = y - 7; \ - yprime += 8 * mapLayout->unk19; \ - yprime %= mapLayout->unk19; \ - \ - block = mapLayout->border[xprime + yprime * mapLayout->unk18]; \ - block |= 0xC00; \ - block; \ +#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) ({ \ - u16 block; \ - s32 xprime; \ - s32 yprime; \ - \ - struct MapLayout *mapLayout = gMapHeader.mapLayout; \ - \ - xprime = x - 7; \ - xprime += 8 * mapLayout->unk18; \ - xprime %= mapLayout->unk18; \ - \ - yprime = y - 7; \ - yprime += 8 * mapLayout->unk19; \ - yprime %= mapLayout->unk19; \ - \ - block = mapLayout->border[xprime + yprime * mapLayout->unk18] | 0xC00; \ - block; \ +#define MapGridGetBorderTileAt2(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] | METATILE_COLLISION_MASK; \ + block; \ }) #define AreCoordsWithinMapGridBounds(x, y) (x >= 0 && x < VMap.Xsize && y >= 0 && y < VMap.Ysize) -- cgit v1.2.3 From 090591b71d627a39ef387ee9520e7a70bf05c129 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 15 Mar 2020 11:29:12 -0400 Subject: Remove unnecessary border tile macro --- src/fieldmap.c | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) (limited to 'src/fieldmap.c') 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) { -- cgit v1.2.3