pyboy 2.5.2__tar.gz → 2.5.4__tar.gz

{pyboy-2.5.2/pyboy.egg-info → pyboy-2.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyboy
-Version: 2.5.2
+Version: 2.5.4
 Summary: Game Boy emulator written in Python
 Author-email: Mads Ynddal <mads@ynddal.dk>
 License: GNU Lesser General Public License

{pyboy-2.5.2 → pyboy-2.5.4}/pyboy/__main__.py

@@ -8,13 +8,9 @@ import argparse
 import copy
 import os
 
-import pyboy
 from pyboy import PyBoy
 from pyboy.plugins.manager import parser_arguments
 from pyboy.pyboy import defaults
-from pyboy.utils import PyBoyInvalidInputException
-
-logger = pyboy.logging.get_logger(__name__)
 
 INTERNAL_LOADSTATE = "INTERNAL_LOADSTATE_TOKEN"
 
@@ -22,21 +18,20 @@ INTERNAL_LOADSTATE = "INTERNAL_LOADSTATE_TOKEN"
 def color_tuple(string):
     color_palette = [int(c.strip(), 16) for c in string.split(",")]
     if not (len(color_palette) == 4):
-        raise PyBoyInvalidInputException(f"Not the correct amount of colors! Expected four, got {len(color_palette)}")
+        parser.error(f"Not the correct amount of colors! Expected four, got {len(color_palette)}")
     return color_palette
 
 
 def cgb_color_tuple(string):
     color_palette = [int(c.strip(), 16) for c in string.split(",")]
     if not (len(color_palette) == 12):
-        raise PyBoyInvalidInputException(f"Not the correct amount of colors! Expected twelve, got {len(color_palette)}")
+        parser.error(f"Not the correct amount of colors! Expected twelve, got {len(color_palette)}")
     return [color_palette[0:4], color_palette[4:8], color_palette[8:12]]
 
 
 def valid_file_path(path):
     if not path == INTERNAL_LOADSTATE and not os.path.isfile(path):
-        logger.error("Filepath '%s' couldn't be found, or isn't a file!", path)
-        exit(1)
+        parser.error(f"Filepath '{path}' couldn't be found, or isn't a file!")
     return path
 
 
@@ -46,14 +41,14 @@ def valid_volume(vol):
     elif vol.isnumeric() and (0 <= int(vol) <= 100):
         return int(vol)
     else:
-        raise ValueError("Invalid volume")
+        parser.error("Invalid volume")
 
 
 def valid_sample_rate(freq):
     if freq.isnumeric() and int(freq) % 60 == 0:
         return int(freq)
     else:
-        raise ValueError("Invalid sample rate")
+        parser.error("Invalid sample rate")
 
 
 parser = argparse.ArgumentParser(
@@ -153,6 +148,8 @@ parser.add_argument(
     help="Set sound sample rate. Has to be divisible in 60.",
 )
 
+parser.add_argument("--title-status", action="store_true", help="Enable performance status in window title")
+
 for arguments in parser_arguments():
     for a in arguments:
         *args, kwargs = a

{pyboy-2.5.2 → pyboy-2.5.4}/pyboy/api/sprite.py

@@ -147,7 +147,7 @@ class Sprite:
             self.attr_palette_number = _bit(attr, 4)
 
         LCDC = LCDCRegister(self.mb.getitem(LCDC_OFFSET))
-        sprite_height = 16 if LCDC._get_sprite_height() else 8
+        sprite_height = 16 if LCDC.sprite_height else 8
         self.shape = (8, sprite_height)
         """
         Sprites can be set to be 8x8 or 8x16 pixels (16 pixels tall). This is defined globally for the rendering

{pyboy-2.5.2 → pyboy-2.5.4}/pyboy/conftest.py

@@ -15,7 +15,6 @@ from zipfile import ZipFile
 
 import numpy as np
 import pytest
-from cryptography.fernet import Fernet
 from filelock import FileLock
 
 from pyboy.utils import cython_compiled
@@ -83,6 +82,8 @@ def secrets():
         if not os.path.isdir(path):
             if not os.environ.get("PYTEST_SECRETS_KEY"):
                 pytest.skip("Cannot access secrets")
+            from cryptography.fernet import Fernet
+
             fernet = Fernet(os.environ["PYTEST_SECRETS_KEY"].encode())
 
             test_data = url_open("https://pyboy.dk/mirror/test_data.encrypted")
@@ -176,6 +177,19 @@ def doctest_fixtures(doctest_namespace, default_rom, default_rom_cgb, supermario
         yield None
 
 
+@pytest.fixture(autouse=True, scope="function")
+def check_stderr_empty(request):
+    capsys = request.getfixturevalue("capsys")
+    yield
+    # If tests want to ignore errors on stderr, they should issue capsys.readouterr() after known errors
+    captured = capsys.readouterr()
+    try:
+        assert captured.err == "", "stderr is not empty"
+        # assert captured.out == "", "stdout is not empty"
+    except AssertionError as e:
+        raise e
+
+
 # Code taken from PyTest is licensed with the following:
 # The MIT License (MIT)
 

{pyboy-2.5.2 → pyboy-2.5.4}/pyboy/core/cpu.py

@@ -5,9 +5,9 @@
 import pyboy
 
 from . import opcodes
+from pyboy.utils import INTR_VBLANK, INTR_LCDC, INTR_TIMER, INTR_SERIAL, INTR_HIGHTOLOW
 
 FLAGC, FLAGH, FLAGN, FLAGZ = range(4, 8)
-INTR_VBLANK, INTR_LCDC, INTR_TIMER, INTR_SERIAL, INTR_HIGHTOLOW = [1 << x for x in range(5)]
 
 
 logger = pyboy.logging.get_logger(__name__)

{pyboy-2.5.2 → pyboy-2.5.4}/pyboy/core/interaction.py

@@ -79,15 +79,15 @@ class Interaction:
         # Guess to make first 4 and last 2 bits true, while keeping selected bits
         joystickByte = 0xFF & (joystickbyte | 0b11001111)
         if P14 and P15:
-            pass
+            joystickByte = 0xF
         elif not P14 and not P15:
-            pass
+            pass  # FIXME: What happens when both are requested?
         elif not P14:
             joystickByte &= self.directional
         elif not P15:
             joystickByte &= self.standard
 
-        return joystickByte
+        return joystickByte | 0b11000000
 
     def save_state(self, f):
         f.write(self.directional)

{pyboy-2.5.2 → pyboy-2.5.4}/pyboy/core/lcd.pxd

@@ -14,7 +14,7 @@ from pyboy.logging.logging cimport Logger
 from pyboy.utils cimport IntIOInterface
 
 
-cdef uint8_t INTR_VBLANK, INTR_LCDC, INTR_TIMER, INTR_SERIAL, INTR_HIGHTOLOW
+cdef uint8_t INTR_VBLANK, INTR_LCDC
 cdef uint16_t LCDC, STAT, SCY, SCX, LY, LYC, DMA, BGP, OBP0, OBP1, WY, WX
 cdef int ROWS, COLS, TILES, FRAME_CYCLES, VIDEO_RAM, OBJECT_ATTRIBUTE_MEMORY
 cdef uint32_t COL0_FLAG, BG_PRIORITY_FLAG
@@ -105,7 +105,7 @@ cdef class LCDCRegister:
     cdef bint window_enable
     cdef bint tiledata_select
     cdef bint backgroundmap_select
-    cdef bint sprite_height
+    cdef readonly bint sprite_height
     cdef bint sprite_enable
     cdef bint background_enable
     cdef bint cgb_master_priority
@@ -113,8 +113,6 @@ cdef class LCDCRegister:
     cdef uint16_t backgroundmap_offset
     cdef uint16_t windowmap_offset
 
-    cpdef int _get_sprite_height(self) noexcept
-
 cdef class Renderer:
     cdef uint8_t[:] _tilecache0_state, _tilecache1_state, _spritecache0_state, _spritecache1_state
     cdef str color_format

{pyboy-2.5.2 → pyboy-2.5.4}/pyboy/core/lcd.py

@@ -8,17 +8,13 @@ from ctypes import c_void_p
 from random import getrandbits
 
 import pyboy
-from pyboy.utils import PyBoyException
+from pyboy.utils import PyBoyException, INTR_VBLANK, INTR_LCDC, FRAME_CYCLES
+from pyboy.api.constants import ROWS, COLS, TILES
 
 logger = pyboy.logging.get_logger(__name__)
 
 VIDEO_RAM = 8 * 1024  # 8KB
 OBJECT_ATTRIBUTE_MEMORY = 0xA0
-INTR_VBLANK, INTR_LCDC, INTR_TIMER, INTR_SERIAL, INTR_HIGHTOLOW = [1 << x for x in range(5)]
-ROWS, COLS = 144, 160
-TILES = 384
-
-FRAME_CYCLES = 70224
 
 
 def rgb_to_bgr(color):
@@ -454,9 +450,6 @@ class LCDCRegister:
         self.backgroundmap_offset = 0x1800 if self.backgroundmap_select == 0 else 0x1C00
         self.windowmap_offset = 0x1800 if self.windowmap_select == 0 else 0x1C00
 
-    def _get_sprite_height(self):
-        return self.sprite_height
-
 
 COL0_FLAG = 0b01
 BG_PRIORITY_FLAG = 0b10
@@ -625,7 +618,7 @@ class Renderer:
         # The lowest X-coordinate has priority, when overlapping
         spriteheight = 16 if lcd._LCDC.sprite_height else 8
         sprite_count = 0
-        for n in range(0x00, 0xA0, 4):
+        for n in range(0x00, OBJECT_ATTRIBUTE_MEMORY, 4):
             y = lcd.OAM[n] - 16  # Documentation states the y coordinate needs to be subtracted by 16
             x = lcd.OAM[n + 1] - 8  # Documentation states the x coordinate needs to be subtracted by 8
 

{pyboy-2.5.2 → pyboy-2.5.4}/pyboy/core/mb.pxd

@@ -23,8 +23,8 @@ cdef Logger logger
 
 cdef int64_t MAX_CYCLES
 cdef uint16_t STAT, LY, LYC
-cdef short VBLANK, LCDC, TIMER, SERIAL, HIGHTOLOW
-cdef int INTR_VBLANK, INTR_LCDC, INTR_TIMER, INTR_SERIAL, INTR_HIGHTOLOW
+cdef int INTR_TIMER, INTR_HIGHTOLOW
+cdef uint16_t OPCODE_BRK
 cdef int STATE_VERSION
 
 

{pyboy-2.5.2 → pyboy-2.5.4}/pyboy/core/mb.py

@@ -4,16 +4,18 @@
 #
 
 import pyboy
-from pyboy.utils import STATE_VERSION, PyBoyException, PyBoyOutOfBoundsException
+from pyboy.utils import (
+    STATE_VERSION,
+    PyBoyException,
+    PyBoyOutOfBoundsException,
+    INTR_TIMER,
+    INTR_HIGHTOLOW,
+    OPCODE_BRK,
+)
 
 from . import bootrom, cartridge, cpu, interaction, lcd, ram, sound, timer
 
-INTR_VBLANK, INTR_LCDC, INTR_TIMER, INTR_SERIAL, INTR_HIGHTOLOW = [1 << x for x in range(5)]
-OPCODE_BRK = 0xDB
-
-
 logger = pyboy.logging.get_logger(__name__)
-
 MAX_CYCLES = 1 << 31
 
 

{pyboy-2.5.2 → pyboy-2.5.4}/pyboy/core/sound.pxd

@@ -8,7 +8,8 @@ from libc.stdint cimport int8_t, int64_t, uint8_t, uint16_t, uint64_t
 
 from pyboy.logging.logging cimport Logger
 from pyboy.utils cimport IntIOInterface, double_to_uint64_ceil
-from pyboy.core.lcd cimport FRAME_CYCLES
+
+cdef int FRAME_CYCLES
 
 
 cdef Logger logger

{pyboy-2.5.2 → pyboy-2.5.4}/pyboy/core/sound.py

@@ -12,10 +12,9 @@ from array import array
 
 import pyboy
 from pyboy.utils import PyBoyAssertException, cython_compiled
+from pyboy.utils import FRAME_CYCLES
 
 if not cython_compiled:
-    from pyboy.core.lcd import FRAME_CYCLES
-
     # Hide it from Cython in 'exec' statement
     exec("from pyboy.utils import double_to_uint64_ceil")
 

{pyboy-2.5.2 → pyboy-2.5.4}/pyboy/plugins/base_plugin.pxd

@@ -8,7 +8,7 @@ cimport numpy as cnp
 from cpython.array cimport array
 from libc.stdint cimport int64_t, uint8_t, uint16_t, uint32_t
 
-from pyboy.core.lcd cimport Renderer
+from pyboy.core.lcd cimport LCD, Renderer, CGBRenderer
 from pyboy.core.sound cimport Sound
 from pyboy.core.mb cimport Motherboard
 from pyboy.logging.logging cimport Logger
@@ -22,6 +22,10 @@ cdef int ROWS, COLS
 cdef class PyBoyPlugin:
     cdef object pyboy
     cdef Motherboard mb
+    cdef Renderer renderer
+    cdef bint is_cgb_renderer
+    cdef CGBRenderer cgb_renderer
+    cdef LCD lcd
     cdef bint cgb
     cdef dict pyboy_argv
     @cython.locals(event=WindowEvent)
@@ -37,7 +41,6 @@ cdef class PyBoyWindowPlugin(PyBoyPlugin):
     cdef int scale
     cdef int[2] _scaledresolution
     cdef bint enable_title
-    cdef Renderer renderer
     cdef Sound sound
 
     cdef int64_t _ftime

{pyboy-2.5.2 → pyboy-2.5.4}/pyboy/plugins/base_plugin.py

@@ -20,6 +20,7 @@ import numpy as np
 
 import pyboy
 from pyboy.api.constants import SPRITES, TILES_CGB
+from pyboy.core.lcd import CGBRenderer
 from pyboy import utils
 
 logger = pyboy.logging.get_logger(__name__)
@@ -31,16 +32,14 @@ class PyBoyPlugin:
     argv = []
 
     def __init__(self, pyboy, mb, pyboy_argv):
-        if not utils.cython_compiled:
-            self.pyboy = pyboy
-            self.mb = mb
-            self.pyboy_argv = pyboy_argv
         self.cgb = mb.cgb
-
-    def __cinit__(self, pyboy, mb, pyboy_argv, *args, **kwargs):
         self.pyboy = pyboy
         self.mb = mb
         self.pyboy_argv = pyboy_argv
+        self.renderer = self.mb.lcd.renderer
+        self.is_cgb_renderer = isinstance(self.mb.lcd.renderer, CGBRenderer)
+        if self.is_cgb_renderer:
+            self.cgb_renderer = self.mb.lcd.renderer
 
     def handle_events(self, events):
         return events
@@ -80,9 +79,6 @@ class PyBoyWindowPlugin(PyBoyPlugin):
             self.renderer = mb.lcd.renderer
         self.sound = self.mb.sound
 
-    def __cinit__(self, *args, **kwargs):
-        self.renderer = self.mb.lcd.renderer
-
     def frame_limiter(self, speed):
         self._ftime += int((1.0 / (60.0 * speed)) * 1_000_000_000)
         now = time.perf_counter_ns()
@@ -142,7 +138,6 @@ class PyBoyGameWrapper(PyBoyPlugin):
 
         self.saved_state = io.BytesIO()
 
-    def __cinit__(self, pyboy, mb, pyboy_argv, *args, **kwargs):
         self.tilemap_background = self.pyboy.tilemap_background
         self.tilemap_window = self.pyboy.tilemap_window
 

{pyboy-2.5.2 → pyboy-2.5.4}/pyboy/plugins/debug.pxd

@@ -9,11 +9,15 @@ from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t
 
 cimport pyboy.plugins.window_sdl2
 from pyboy.api.tilemap cimport TileMap
-from pyboy.core.mb cimport Motherboard
+from pyboy.api.tile cimport Tile
+from pyboy.api.sprite cimport Sprite
+from pyboy.core.lcd cimport Renderer, CGBRenderer
 from pyboy.logging.logging cimport Logger
 from pyboy.plugins.base_plugin cimport PyBoyWindowPlugin
 from pyboy.utils cimport WindowEvent
 
+cdef uint64_t COLS, ROWS, TILES, VRAM_OFFSET, HIGH_TILEMAP, SPRITES
+cdef uint32_t COLOR, COLOR_BACKGROUND, SPRITE_BACKGROUND, COLOR_WINDOW
 
 cdef Logger logger
 
@@ -77,11 +81,22 @@ cdef class TileViewWindow(BaseDebugWindow):
 
     cdef uint8_t[:,:] tilecache # Fixing Cython locals
     cdef uint32_t[:] palette_rgb # Fixing Cython locals
-    @cython.locals(mem_offset=uint16_t, tile_index=int, tile_column=int, tile_row=int)
+    @cython.locals(
+        mem_offset=uint16_t,
+        tile_index=int,
+        tile_column=int,
+        tile_row=int,
+        tile_num = uint8_t,
+        palette = uint8_t,
+        vbank = uint8_t,
+        horiflip = uint8_t,
+        vertflip = uint8_t,
+        bg_priority = uint8_t,
+    )
     cdef void post_tick(self) noexcept
 
     # scanlineparameters=uint8_t[:,:],
-    @cython.locals(x=int, y=int, xx=int, yy=int, row=int, column=int)
+    @cython.locals(x=int, y=int, xx=int, yy=int, row=int, column=int, background_view=bint, t=MarkedTile)
     cdef void draw_overlay(self) noexcept
 
     @cython.locals(tile_x=int, tile_y=int, tile_identifier=int)
@@ -107,7 +122,7 @@ cdef class SpriteWindow(BaseDebugWindow):
     @cython.locals(tile_x=int, tile_y=int, sprite_identifier=int, sprite=object)
     cdef list handle_events(self, list)
 
-    @cython.locals(t=MarkedTile, xx=int, yy=int, sprite=object, i=int)
+    @cython.locals(m=MarkedTile, xx=int, yy=int, sprite=object, i=int, sprite_index=int)
     cdef void draw_overlay(self) noexcept
 
     @cython.locals(title=str)
@@ -120,7 +135,7 @@ cdef class SpriteViewWindow(BaseDebugWindow):
     @cython.locals(t=int, x=int, y=int)
     cdef void post_tick(self) noexcept
 
-    @cython.locals(t=MarkedTile, sprite=object, i=int)
+    @cython.locals(m=MarkedTile, sprite=Sprite, i=int, sprite_index=int)
     cdef void draw_overlay(self) noexcept
 
     @cython.locals(title=str)
@@ -142,10 +157,12 @@ cdef class MemoryWindow(BaseDebugWindow):
     cdef int[3] bg_color
 
     cdef void write_border(self) noexcept
-    @cython.locals(header=bytes, addr=bytes)
+    # @cython.locals(header=uint8_t[:], addr=uint8_t[:])
     cdef void write_addresses(self) noexcept
+    # @cython.locals(a=uint8_t[:])
     cdef void write_memory(self) noexcept
     @cython.locals(text=uint8_t[:])
     cdef void render_text(self) noexcept
     @cython.locals(i=int, c=uint8_t)
     cdef void draw_text(self, int, int, uint8_t[:]) noexcept
+    cdef void _scroll_view(self, int)

{pyboy-2.5.2 → pyboy-2.5.4}/pyboy/plugins/debug.py

@@ -10,7 +10,8 @@ from array import array
 from base64 import b64decode
 from ctypes import c_void_p
 
-from pyboy.api import Sprite, constants
+from pyboy.api.sprite import Sprite
+from pyboy.api.constants import COLS, ROWS, TILES, VRAM_OFFSET, HIGH_TILEMAP, SPRITES
 from pyboy.api.tilemap import TileMap
 from pyboy.plugins.base_plugin import PyBoyWindowPlugin
 from pyboy.plugins.window_sdl2 import sdl2_event_pump
@@ -122,8 +123,8 @@ class Debug(PyBoyWindowPlugin):
             pyboy_argv,
             scale=2,
             title="Sprite View",
-            width=constants.COLS,
-            height=constants.ROWS,
+            width=COLS,
+            height=ROWS,
             pos_x=window_pos,
             pos_y=0,
         )
@@ -139,7 +140,7 @@ class Debug(PyBoyWindowPlugin):
             pos_x=window_pos,
             pos_y=self.spriteview.height * 2 + 68,
         )
-        window_pos += constants.COLS * self.spriteview.scale
+        window_pos += COLS * self.spriteview.scale
 
         self.memory = MemoryWindow(
             pyboy, mb, pyboy_argv, scale=1, title="Memory", width=8 * 60, height=16 * 36, pos_x=window_pos, pos_y=0
@@ -148,7 +149,7 @@ class Debug(PyBoyWindowPlugin):
 
         window_pos = 0
         tile_data_width = 16 * 8  # Change the 16 to however wide you want the tile window
-        tile_data_height = ((constants.TILES * 8) // tile_data_width) * 8
+        tile_data_height = ((TILES * 8) // tile_data_width) * 8
         self.tiledata0 = TileDataWindow(
             pyboy,
             mb,
@@ -323,7 +324,7 @@ class TileViewWindow(BaseDebugWindow):
 
     def post_tick(self):
         # Updating screen buffer by copying tiles from cache
-        mem_offset = self.tilemap.map_offset - constants.VRAM_OFFSET
+        mem_offset = self.tilemap.map_offset - VRAM_OFFSET
         for n in range(mem_offset, mem_offset + 0x400):
             tile_index = self.mb.lcd.VRAM0[n]
 
@@ -339,8 +340,8 @@ class TileViewWindow(BaseDebugWindow):
 
             # tilecache = None
             # palette_rgb = None
-            if self.cgb:
-                palette, vbank, horiflip, vertflip, bg_priority = self.renderer._cgb_get_background_map_attributes(
+            if self.is_cgb_renderer:
+                palette, vbank, horiflip, vertflip, bg_priority = self.cgb_renderer._cgb_get_background_map_attributes(
                     self.mb.lcd, n
                 )
                 self.renderer.update_tilecache1(self.mb.lcd, tile_index, 1)
@@ -392,11 +393,7 @@ class TileViewWindow(BaseDebugWindow):
 
     def update_title(self):
         title = self.base_title
-        title += (
-            " [HIGH MAP 0x9C00-0x9FFF]"
-            if self.tilemap.map_offset == constants.HIGH_TILEMAP
-            else " [LOW MAP 0x9800-0x9BFF]"
-        )
+        title += " [HIGH MAP 0x9C00-0x9FFF]" if self.tilemap.map_offset == HIGH_TILEMAP else " [LOW MAP 0x9800-0x9BFF]"
         title += (
             " [HIGH DATA (SIGNED) 0x8800-0x97FF]"
             if self.tilemap.signed_tile_data
@@ -410,41 +407,40 @@ class TileViewWindow(BaseDebugWindow):
 
     def draw_overlay(self):
         global marked_tiles
-        scanlineparameters = self.pyboy.screen.tilemap_position_list
 
         background_view = self.scanline_x == 0
 
         # TODO: Refactor this
         # Mark screen area
-        for y in range(constants.ROWS):
-            xx = int(scanlineparameters[y][self.scanline_x])
-            yy = int(scanlineparameters[y][self.scanline_y])
+        for y in range(ROWS):
+            xx = self.mb.lcd._scanlineparameters[y][self.scanline_x]
+            yy = self.mb.lcd._scanlineparameters[y][self.scanline_y]
 
             if background_view:  # Background
                 # Wraps around edges of the screen
-                if y == 0 or y == constants.ROWS - 1:  # Draw top/bottom bar
-                    for x in range(constants.COLS):
+                if y == 0 or y == ROWS - 1:  # Draw top/bottom bar
+                    for x in range(COLS):
                         self.buf0[(yy + y) % 0xFF, (xx + x) % 0xFF] = COLOR
                 else:  # Draw body
                     self.buf0[(yy + y) % 0xFF, xx % 0xFF] = COLOR
-                    for x in range(constants.COLS):
+                    for x in range(COLS):
                         self.buf0[(yy + y) % 0xFF, (xx + x) % 0xFF] &= self.color
-                    self.buf0[(yy + y) % 0xFF, (xx + constants.COLS) % 0xFF] = COLOR
+                    self.buf0[(yy + y) % 0xFF, (xx + COLS) % 0xFF] = COLOR
             else:  # Window
                 # Takes a cut of the screen
                 xx = -xx
                 yy = -yy
-                if yy + y == 0 or y == constants.ROWS - 1:  # Draw top/bottom bar
-                    for x in range(constants.COLS):
-                        if 0 <= xx + x < constants.COLS:
+                if yy + y == 0 or y == ROWS - 1:  # Draw top/bottom bar
+                    for x in range(COLS):
+                        if 0 <= xx + x < COLS:
                             self.buf0[yy + y, xx + x] = COLOR
                 else:  # Draw body
                     if 0 <= yy + y:
                         self.buf0[yy + y, max(xx, 0)] = COLOR
-                        for x in range(constants.COLS):
-                            if 0 <= xx + x < constants.COLS:
+                        for x in range(COLS):
+                            if 0 <= xx + x < COLS:
                                 self.buf0[yy + y, xx + x] &= self.color
-                        self.buf0[yy + y, xx + constants.COLS] = COLOR
+                        self.buf0[yy + y, xx + COLS] = COLOR
 
         # Mark selected tiles
         for t, match in zip(
@@ -457,10 +453,10 @@ class TileViewWindow(BaseDebugWindow):
 
         # Mark current scanline directly from LY,SCX,SCY,WX,WY
         if background_view:
-            for x in range(constants.COLS):
+            for x in range(COLS):
                 self.buf0[(self.mb.lcd.SCY + self.mb.lcd.LY) % 0xFF, (self.mb.lcd.SCX + x) % 0xFF] = 0xFF00CE12
         else:
-            for x in range(constants.COLS):
+            for x in range(COLS):
                 self.buf0[(self.mb.lcd.WY + self.mb.lcd.LY) % 0xFF, (self.mb.lcd.WX + x) % 0xFF] = 0xFF00CE12
 
 
@@ -481,7 +477,7 @@ class TileDataWindow(BaseDebugWindow):
         else:
             self.palette_rgb = self.mb.lcd.BGP.palette_mem_rgb
 
-        for t in range(constants.TILES):
+        for t in range(TILES):
             if self.tilecache_select:
                 self.renderer.update_tilecache1(self.mb.lcd, t, 1)
             else:
@@ -581,7 +577,7 @@ class SpriteWindow(BaseDebugWindow):
                 if event.mouse_button == 0:
                     tile_x, tile_y = event.mouse_x // 8, event.mouse_y // sprite_height
                     sprite_identifier = tile_y * (self.width // 8) + tile_x
-                    if sprite_identifier > constants.SPRITES:
+                    if sprite_identifier > SPRITES:
                         # Out of bounds
                         continue
                     sprite = Sprite(self.mb, sprite_identifier)
@@ -624,8 +620,8 @@ class SpriteWindow(BaseDebugWindow):
 
 class SpriteViewWindow(BaseDebugWindow):
     def post_tick(self):
-        for y in range(constants.ROWS):
-            for x in range(constants.COLS):
+        for y in range(ROWS):
+            for x in range(COLS):
                 self.buf0[y, x] = SPRITE_BACKGROUND
 
         for ly in range(144):