diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-09-18 10:15:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-18 10:15:26 -0500 |
| commit | 25e469b6644377ec4e4f82eab294437a61ea7635 (patch) | |
| tree | c0a77c2ddf82b94d7bd5c8f12b1ee7c1de8a647c /src/field_camera.c | |
| parent | 7f2d52d9e0d6a449a5df2274fdb80ede9e2bec54 (diff) | |
| parent | 8a05bf82ec680aba6b331313742e61812ac30f1e (diff) | |
Merge pull request #333 from Diegoisawesome/master
Add defines for tile, metatile, and palette count
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 8629bec2b..e8900e06a 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -232,14 +232,14 @@ static void DrawMetatileAt(const struct MapLayout *mapLayout, u16 b, int c, int u16 metatileId = MapGridGetMetatileIdAt(c, d); u16 *metatiles; - if (metatileId > 1024) + if (metatileId > NUM_METATILES_TOTAL) metatileId = 0; - if (metatileId < 512) + if (metatileId < NUM_METATILES_IN_PRIMARY) metatiles = mapLayout->primaryTileset->metatiles; else { metatiles = mapLayout->secondaryTileset->metatiles; - metatileId -= 512; + metatileId -= NUM_METATILES_IN_PRIMARY; } DrawMetatile(MapGridGetMetatileLayerTypeAt(c, d), metatiles + metatileId * 8, b); } |