dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary border tile macro

Browse Source
This commit is contained in:
GriffinR
2020-03-15 11:29:12 -04:00
parent de53dabab2
commit 090591b71d
1 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fieldmap.c
+2 -23
View File
@@ -365,27 +365,7 @@ union Block
u16 value; u16 value;
}; };
#define MapGridGetBorderTileAt(x, y) ({ \ #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; \ u16 block; \
s32 xprime; \ s32 xprime; \
s32 yprime; \ s32 yprime; \
@@ -401,12 +381,11 @@ union Block
yprime %= mapLayout->borderHeight; \ yprime %= mapLayout->borderHeight; \
\ \
block = mapLayout->border[xprime + yprime * mapLayout->borderWidth] | METATILE_COLLISION_MASK; \ 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 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) u8 MapGridGetZCoordAt(s32 x, s32 y)
{ {