all repos — mgba @ 5c1140c34e8e9082fff08ca708e2eb8a30a415ac

mGBA Game Boy Advance Emulator

GBA Video: Fix bg mode 3 - 5 tiles properly this time
Jeffrey Pfau jeffrey@endrift.com
Wed, 29 Jul 2015 01:17:51 -0700
commit

5c1140c34e8e9082fff08ca708e2eb8a30a415ac

parent

36047f4c4433daafa6603c6d53989591f4544671

2 files changed, 4 insertions(+), 0 deletions(-)

jump to
M CHANGESCHANGES

@@ -64,6 +64,7 @@ - Qt: Fix window being too tall after exiting fullscreen

- Qt: Fix a missing va_end call in the log handler lambda within the GameController constructor - GBA Cheats: Fix Pro Action Replay and GameShark issues when used together - Qt: Fix analog buttons not getting unmapped + - GBA Video: Prevent tiles < 512 from being used in modes 3 - 5 Misc: - Qt: Handle saving input settings better - Debugger: Free watchpoints in addition to breakpoints
M src/gba/renderers/software-obj.csrc/gba/renderers/software-obj.c

@@ -116,6 +116,9 @@ int32_t x = GBAObjAttributesBGetX(sprite->b) << 23;

x >>= 23; uint16_t* vramBase = &renderer->d.vram[BASE_TILE >> 1]; unsigned charBase = GBAObjAttributesCGetTile(sprite->c) * 0x20; + if (GBARegisterDISPCNTGetMode(renderer->dispcnt) >= 3 && GBAObjAttributesCGetTile(sprite->c) < 512) { + return 0; + } int variant = renderer->target1Obj && GBAWindowControlIsBlendEnable(renderer->currentWindow.packed) && (renderer->blendEffect == BLEND_BRIGHTEN || renderer->blendEffect == BLEND_DARKEN); if (GBAObjAttributesAGetMode(sprite->a) == OBJ_MODE_SEMITRANSPARENT) { int target2 = renderer->target2Bd << 4;