ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GBA Video: Fix another merge casualty

This commit is contained in:
Vicki Pfau 2020-07-17 00:22:59 -07:00
parent c7f85f7b7e
commit dd67bf9797
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gba/renderers/software-mode0.c
View File

@ -14,7 +14,11 @@
} \
screenBase = background->screenBase + yBase + (xBase >> 2); \
uint16_t* screenBlock = renderer->d.vramBG[screenBase >> VRAM_BLOCK_OFFSET]; \
LOAD_16(mapData, screenBase & VRAM_BLOCK_MASK, screenBlock); \
if (LIKELY(screenBlock)) { \
LOAD_16(mapData, screenBase & VRAM_BLOCK_MASK, screenBlock); \
} else { \
mapData = 0; \
}
#define DRAW_BACKGROUND_MODE_0_TILE_SUFFIX_16(BLEND, OBJWIN) \
paletteData = GBA_TEXT_MAP_PALETTE(mapData) << 4; \