From 257284d3e209dbc67244027360c7870be030b28d Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Tue, 28 Jul 2020 17:44:53 -0700 Subject: [PATCH] GBA Video: Fix block masking in mosaic mode 0 --- src/gba/renderers/software-mode0.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/gba/renderers/software-mode0.c b/src/gba/renderers/software-mode0.c index 87897cddb..ad5f2cb96 100644 --- a/src/gba/renderers/software-mode0.c +++ b/src/gba/renderers/software-mode0.c @@ -357,21 +357,21 @@ if (UNLIKELY(!vram)) { \ carryData = 0; \ } else { \ - LOAD_32(tileData, charBase, vram); \ + LOAD_32(tileData, charBase & VRAM_BLOCK_MASK, vram); \ if (!GBA_TEXT_MAP_HFLIP(mapData)) { \ if (x >= 4) { \ - LOAD_32(tileData, charBase + 4, vram); \ + LOAD_32(tileData, (charBase + 4) & VRAM_BLOCK_MASK, vram); \ tileData >>= (x - 4) * 8; \ } else { \ - LOAD_32(tileData, charBase, vram); \ + LOAD_32(tileData, charBase & VRAM_BLOCK_MASK, vram); \ tileData >>= x * 8; \ } \ } else { \ if (x >= 4) { \ - LOAD_32(tileData, charBase, vram); \ + LOAD_32(tileData, charBase & VRAM_BLOCK_MASK, vram); \ tileData >>= (7 - x) * 8; \ } else { \ - LOAD_32(tileData, charBase + 4, vram); \ + LOAD_32(tileData, (charBase + 4) & VRAM_BLOCK_MASK, vram); \ tileData >>= (3 - x) * 8; \ } \ } \ @@ -592,21 +592,21 @@ if (UNLIKELY(!vram)) { \ carryData = 0; \ } else { \ - LOAD_32(tileData, charBase, vram); \ + LOAD_32(tileData, charBase & VRAM_BLOCK_MASK, vram); \ if (!GBA_TEXT_MAP_HFLIP(mapData)) { \ if (x >= 4) { \ - LOAD_32(tileData, charBase + 4, vram); \ + LOAD_32(tileData, (charBase + 4) & VRAM_BLOCK_MASK, vram); \ tileData >>= (x - 4) * 8; \ } else { \ - LOAD_32(tileData, charBase, vram); \ + LOAD_32(tileData, charBase & VRAM_BLOCK_MASK, vram); \ tileData >>= x * 8; \ } \ } else { \ if (x >= 4) { \ - LOAD_32(tileData, charBase, vram); \ + LOAD_32(tileData, charBase & VRAM_BLOCK_MASK, vram); \ tileData >>= (7 - x) * 8; \ } else { \ - LOAD_32(tileData, charBase + 4, vram); \ + LOAD_32(tileData, (charBase + 4) & VRAM_BLOCK_MASK, vram); \ tileData >>= (3 - x) * 8; \ } \ } \