all repos — mgba @ 2ca96050f6efed95f80009b08c0529641f029d49

mGBA Game Boy Advance Emulator

GB Video: Fix SGB borders drawing erroneously (fixes #1060)
Vicki Pfau vi@endrift.com
Sat, 21 Apr 2018 21:33:28 -0700
commit

2ca96050f6efed95f80009b08c0529641f029d49

parent

af3384a60f84617dafe96b74e6c98d4e22876baf

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

jump to
M src/gb/renderers/software.c → src/gb/renderers/software.c 
@@ -378,12 +378,8 @@ }
 
 		break;
 	case SGB_ATRC_EN:
-		if (softwareRenderer->sgbBorders && !renderer->sgbRenderMode) {
-			_regenerateSGBBorder(softwareRenderer);
-		}
-		break;
 	case SGB_MASK_EN:
-		if (!renderer->sgbRenderMode) {
+		if (softwareRenderer->sgbBorders && !renderer->sgbRenderMode) {
 			_regenerateSGBBorder(softwareRenderer);
 		}
 	}

@@ -412,7 +408,7 @@ renderer->writePalette(renderer, 0x40, value);
 		renderer->writePalette(renderer, 0x50, value);
 		renderer->writePalette(renderer, 0x60, value);
 		renderer->writePalette(renderer, 0x70, value);
-		if (!renderer->sgbRenderMode) {
+		if (softwareRenderer->sgbBorders && !renderer->sgbRenderMode) {
 			_regenerateSGBBorder(softwareRenderer);
 		}
 	}