diff options
author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-26 22:56:22 -0500 |
---|---|---|
committer | huderlem <huderlem@gmail.com> | 2019-02-28 22:21:16 -0600 |
commit | da0687987d8d4f6cb9a331f30553ffb806e74165 (patch) | |
tree | b85e2dea111aabaee3418efcf498ccfb2be206da /src/bg.c | |
parent | 189d387f01104a715d788690fbc76d987ea3d6e1 (diff) |
Pick better names for constants
Diffstat (limited to 'src/bg.c')
-rw-r--r-- | src/bg.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1056,7 +1056,7 @@ void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 widt for (x16 = x; x16 < (x + width); x16++) { CopyTileMapEntry(&firstTileNum, &((u16*)sGpuBgConfigs2[bg].tilemap)[(u16)GetTileMapIndexFromCoords(x16, y16, attribute, mode, mode2)], paletteSlot, 0, 0); - firstTileNum = (firstTileNum & 0xFC00) + ((firstTileNum + tileNumDelta) & MAP_METATILE_ID_MASK); + firstTileNum = (firstTileNum & (METATILE_COLLISION_MASK | METATILE_ELEVATION_MASK)) + ((firstTileNum + tileNumDelta) & METATILE_ID_MASK); } } break; @@ -1067,7 +1067,7 @@ void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 widt for (x16 = x; x16 < (x + width); x16++) { ((u8*)sGpuBgConfigs2[bg].tilemap)[(y16 * mode3) + x16] = firstTileNum; - firstTileNum = (firstTileNum & 0xFC00) + ((firstTileNum + tileNumDelta) & MAP_METATILE_ID_MASK); + firstTileNum = (firstTileNum & (METATILE_COLLISION_MASK | METATILE_ELEVATION_MASK)) + ((firstTileNum + tileNumDelta) & METATILE_ID_MASK); } } break; |