From 39683e0362a63ecbffc289b1e45d3e10106fbc58 Mon Sep 17 00:00:00 2001 From: garak Date: Mon, 29 Jul 2019 14:42:28 -0400 Subject: use more accurate metatile collision expression --- src/fieldmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/fieldmap.c') diff --git a/src/fieldmap.c b/src/fieldmap.c index 4b5149878..8e24e3b9e 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -382,13 +382,13 @@ u8 MapGridIsImpassableAt(int x, int y) i = (x + 1) & 1; i += ((y + 1) & 1) * 2; block = gMapHeader.mapLayout->border[i]; - block |= 0xc00; + block |= METATILE_COLLISION_MASK; } - if (block == 0x3ff) + if (block == METATILE_ID_UNDEFINED) { return 1; } - return (block & 0xc00) >> 10; + return (block & METATILE_COLLISION_MASK) >> 10; } u32 MapGridGetMetatileIdAt(int x, int y) -- cgit v1.2.3