all repos — mgba @ 51af2c3af2f8c6b537bd887615b4b387506f4d65

mGBA Game Boy Advance Emulator

GBA Video: Fix force-alignment on 256 color linear objs
Vicki Pfau vi@endrift.com
Sun, 24 Dec 2017 17:05:12 -0800
commit

51af2c3af2f8c6b537bd887615b4b387506f4d65

parent

e56ca6ac088cb84fe2af69acc33d263742ece373

8 files changed, 2 insertions(+), 1 deletions(-)

jump to
M src/gba/renderers/software-obj.c → src/gba/renderers/software-obj.c 
@@ -148,7 +148,8 @@ }
 	int32_t x = (uint32_t) GBAObjAttributesBGetX(sprite->b) << 23;
 	x >>= 23;
 	uint16_t* vramBase = &renderer->d.vram[BASE_TILE >> 1];
-	unsigned charBase = (GBAObjAttributesCGetTile(sprite->c) & ~GBAObjAttributesAGet256Color(sprite->a)) * 0x20;
+	bool align = GBAObjAttributesAIs256Color(sprite->a) && !GBARegisterDISPCNTIsObjCharacterMapping(renderer->dispcnt);
+	unsigned charBase = (GBAObjAttributesCGetTile(sprite->c) & ~align) * 0x20;
 	if (GBARegisterDISPCNTGetMode(renderer->dispcnt) >= 3 && GBAObjAttributesCGetTile(sprite->c) < 512) {
 		return 0;
 	}