Move window internal counter

pyboy/core/lcd.py

@@ -463,14 +463,12 @@ def scanline(self, lcd, y):
         if lcd.disable_renderer:
             return
 
-        # Weird behavior, where the window has it's own internal line counter. It's only incremented whenever the
-        # window is drawing something on the screen.
-        if lcd._LCDC.window_enable and wy <= y and wx < COLS:
-            self.ly_window += 1
-
         x = 0
         if not self.cgb:
             if lcd._LCDC.window_enable and wy <= y and wx < COLS:
+                # Window has it's own internal line counter. It's only incremented whenever the window is drawing something on the screen.
+                self.ly_window += 1
+
                 # Before window
                 if wx > x:
                     x += self.scanline_background(y, x, bx, by, wx, lcd)
@@ -484,6 +482,9 @@ def scanline(self, lcd, y):
                 self.scanline_blank(y, x, COLS, lcd)
         else:
             if lcd._LCDC.window_enable and wy <= y and wx < COLS:
+                # Window has it's own internal line counter. It's only incremented whenever the window is drawing something on the screen.
+                self.ly_window += 1
+
                 # Before window
                 if wx > x:
                     x += self.scanline_background_cgb(y, x, bx, by, wx, lcd)