diff --git a/cinema/gb/window/kdt-battle/baseline_0000.png b/cinema/gb/window/kdt-battle/baseline_0000.png
new file mode 100644
index 000000000..2ba1aa28b
Binary files /dev/null and b/cinema/gb/window/kdt-battle/baseline_0000.png differ
diff --git a/cinema/gb/window/kdt-battle/baseline_0001.png b/cinema/gb/window/kdt-battle/baseline_0001.png
new file mode 100644
index 000000000..2ba1aa28b
Binary files /dev/null and b/cinema/gb/window/kdt-battle/baseline_0001.png differ
diff --git a/cinema/gb/window/kdt-battle/baseline_0002.png b/cinema/gb/window/kdt-battle/baseline_0002.png
new file mode 100644
index 000000000..2ba1aa28b
Binary files /dev/null and b/cinema/gb/window/kdt-battle/baseline_0002.png differ
diff --git a/cinema/gb/window/kdt-battle/baseline_0003.png b/cinema/gb/window/kdt-battle/baseline_0003.png
new file mode 100644
index 000000000..2ba1aa28b
Binary files /dev/null and b/cinema/gb/window/kdt-battle/baseline_0003.png differ
diff --git a/cinema/gb/window/kdt-battle/baseline_0004.png b/cinema/gb/window/kdt-battle/baseline_0004.png
new file mode 100644
index 000000000..2ba1aa28b
Binary files /dev/null and b/cinema/gb/window/kdt-battle/baseline_0004.png differ
diff --git a/cinema/gb/window/kdt-battle/baseline_0005.png b/cinema/gb/window/kdt-battle/baseline_0005.png
new file mode 100644
index 000000000..2ba1aa28b
Binary files /dev/null and b/cinema/gb/window/kdt-battle/baseline_0005.png differ
diff --git a/cinema/gb/window/kdt-battle/baseline_0006.png b/cinema/gb/window/kdt-battle/baseline_0006.png
new file mode 100644
index 000000000..2ba1aa28b
Binary files /dev/null and b/cinema/gb/window/kdt-battle/baseline_0006.png differ
diff --git a/cinema/gb/window/kdt-battle/baseline_0007.png b/cinema/gb/window/kdt-battle/baseline_0007.png
new file mode 100644
index 000000000..2491849a8
Binary files /dev/null and b/cinema/gb/window/kdt-battle/baseline_0007.png differ
diff --git a/cinema/gb/window/kdt-battle/baseline_0008.png b/cinema/gb/window/kdt-battle/baseline_0008.png
new file mode 100644
index 000000000..2491849a8
Binary files /dev/null and b/cinema/gb/window/kdt-battle/baseline_0008.png differ
diff --git a/cinema/gb/window/kdt-battle/baseline_0009.png b/cinema/gb/window/kdt-battle/baseline_0009.png
new file mode 100644
index 000000000..2491849a8
Binary files /dev/null and b/cinema/gb/window/kdt-battle/baseline_0009.png differ
diff --git a/cinema/gb/window/kdt-battle/test.mvl b/cinema/gb/window/kdt-battle/test.mvl
new file mode 100644
index 000000000..f665f969c
Binary files /dev/null and b/cinema/gb/window/kdt-battle/test.mvl differ
diff --git a/src/gb/renderers/software.c b/src/gb/renderers/software.c
index 4960b395c..93b2d3085 100644
--- a/src/gb/renderers/software.c
+++ b/src/gb/renderers/software.c
@@ -508,7 +508,7 @@ static void GBVideoSoftwareRendererDrawRange(struct GBVideoRenderer* renderer, i
 		if (GBRegisterLCDCIsWindow(softwareRenderer->lcdc) && wy == y && wx <= endX) {
 			softwareRenderer->hasWindow = true;
 		}
-		if (softwareRenderer->hasWindow && wx <= endX) {
+		if (GBRegisterLCDCIsWindow(softwareRenderer->lcdc) && softwareRenderer->hasWindow && wx <= endX) {
 			if (wx > 0 && !softwareRenderer->d.disableBG) {
 				GBVideoSoftwareRendererDrawBackground(softwareRenderer, maps, startX, wx, softwareRenderer->scx - softwareRenderer->offsetScx, softwareRenderer->scy + y - softwareRenderer->offsetScy);
 			}