diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2022-01-26 17:51:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-26 17:51:56 -0500 |
| commit | 2efbd5f549bd03cfdaea2c84d48d5fb706034464 (patch) | |
| tree | 2454365b3478382c4246dc850f700f661377ed46 /gflib/bg.c | |
| parent | 4188dd405c07943da9fb6d5c048d5845a94e0669 (diff) | |
| parent | 3d0326106ed683911da66eee1bf94becadc7a2db (diff) | |
Merge pull request #1608 from GriffinRichards/fix-fieldmap
Fix some incorrect fieldmap names
Diffstat (limited to 'gflib/bg.c')
| -rw-r--r-- | gflib/bg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gflib/bg.c b/gflib/bg.c index c96bcbc23..6e97be207 100644 --- a/gflib/bg.c +++ b/gflib/bg.c @@ -1053,7 +1053,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 & (METATILE_COLLISION_MASK | METATILE_ELEVATION_MASK)) + ((firstTileNum + tileNumDelta) & METATILE_ID_MASK); + firstTileNum = (firstTileNum & (MAPGRID_COLLISION_MASK | MAPGRID_ELEVATION_MASK)) + ((firstTileNum + tileNumDelta) & MAPGRID_METATILE_ID_MASK); } } break; @@ -1064,7 +1064,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 & (METATILE_COLLISION_MASK | METATILE_ELEVATION_MASK)) + ((firstTileNum + tileNumDelta) & METATILE_ID_MASK); + firstTileNum = (firstTileNum & (MAPGRID_COLLISION_MASK | MAPGRID_ELEVATION_MASK)) + ((firstTileNum + tileNumDelta) & MAPGRID_METATILE_ID_MASK); } } break; |