diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-09-20 14:39:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-20 14:39:10 -0400 |
| commit | 0ae6f1e4af8b8feee679775723fc22c3f3b95210 (patch) | |
| tree | 3932099bd0b5d333542ab829bf343364b2831a95 /src/field_camera.c | |
| parent | 3e80e081b5c9d44ecc2e507302f67d4fbd8c48e6 (diff) | |
| parent | 4abad1211c302f1dd3694d3169820840cbec7b88 (diff) | |
Merge pull request #1 from pret/master
Pulling master commits
Diffstat (limited to 'src/field_camera.c')
| -rw-r--r-- | src/field_camera.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field_camera.c b/src/field_camera.c index 29cdf0496..319c8a540 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -231,17 +231,17 @@ static void DrawMetatileAt(struct MapLayout *mapLayout, u16 offset, int x, int y u16 *metatiles; u16 metatileId = MapGridGetMetatileIdAt(x, y); - if (metatileId > 0x400) + if (metatileId > NUM_METATILES_TOTAL) metatileId = 0; - if (metatileId < 0x200) + if (metatileId < NUM_METATILES_IN_PRIMARY) { metatiles = mapLayout->primaryTileset->metatiles; } else { metatiles = mapLayout->secondaryTileset->metatiles; - metatileId -= 0x200; + metatileId -= NUM_METATILES_IN_PRIMARY; } DrawMetatile(MapGridGetMetatileLayerTypeAt(x, y), metatiles + metatileId * 8, offset); |