diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-16 07:59:43 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-16 07:59:43 -0400 |
| commit | 160df58342d150af791b22126af0994810e309d9 (patch) | |
| tree | 9e4f03bde1138472d893b36835bf5f2f5a316e90 /src | |
| parent | 923129a948eff063003c30fc6337a009a84653ab (diff) | |
| parent | 2c7387951ba78349712d891ca71b55db4d0ec96e (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into pokemon_storage_system
Diffstat (limited to 'src')
| -rw-r--r-- | src/fieldmap.c | 55 |
1 files changed, 17 insertions, 38 deletions
diff --git a/src/fieldmap.c b/src/fieldmap.c index 3d308f165..8b0beef34 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -365,48 +365,27 @@ 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 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 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] | METATILE_COLLISION_MASK; \ }) #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) { |