pyboy 2.4.0__tar.gz → 2.5.0__tar.gz

{pyboy-2.4.0/pyboy.egg-info → pyboy-2.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pyboy
-Version: 2.4.0
+Version: 2.5.0
 Summary: Game Boy emulator written in Python
 Author-email: Mads Ynddal <mads@ynddal.dk>
 License: GNU Lesser General Public License
@@ -177,7 +177,7 @@ Classifier: Programming Language :: Cython
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: System :: Emulators
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: numpy
@@ -193,9 +193,9 @@ Requires-Dist: gym; extra == "all"
 <img src="extras/README/pyboy.svg" width="480">
 </p>
 
-__If you have any questions, or just want to chat, [join us on Discord](https://discord.gg/Zrf2nyH).__
+__If you have any questions, or just want to chat, [join us on Discord](https://discord.gg/wUbag3KNqQ).__
 
-[![Discord](https://img.shields.io/discord/584149554132418570?style=for-the-badge&logo=Discord&label=PyBoy)](https://discord.gg/Zrf2nyH)
+[![Discord](https://img.shields.io/discord/584149554132418570?style=for-the-badge&logo=Discord&label=PyBoy)](https://discord.gg/wUbag3KNqQ)
 
 <!---
 Generate GIF with the layout and captions
@@ -289,7 +289,7 @@ If you are looking to make a bot or AI, then these resources are a good place to
    * [Example: Tetris](https://github.com/Baekalfen/PyBoy/wiki/Example-Tetris)
    * [Example: Super Mario Land](https://github.com/Baekalfen/PyBoy/wiki/Example-Super-Mario-Land)
    * [Code Examples](https://github.com/Baekalfen/PyBoy/tree/master/extras/examples)
- * [Discord](https://discord.gg/Zrf2nyH)
+ * [Discord](https://discord.gg/wUbag3KNqQ)
 
 
 When the emulator is running, you can easily access [PyBoy's API](https://baekalfen.github.io/PyBoy/index.html):
@@ -377,9 +377,9 @@ do 3160 hours of gameplay in 1 hour.
 
 Contributing
 ============
-Any contribution is appreciated. The currently known problems are tracked in [the Issues tab](https://github.com/Baekalfen/PyBoy/issues). Feel free to take a swing at any one of them. If you have something original in mind, come and [discuss it on on Discord](https://discord.gg/Zrf2nyH).
+Any contribution is appreciated. The currently known problems are tracked in [the Issues tab](https://github.com/Baekalfen/PyBoy/issues). Feel free to take a swing at any one of them. If you have something original in mind, come and [discuss it on on Discord](https://discord.gg/wUbag3KNqQ).
 
-[![Discord](https://img.shields.io/discord/584149554132418570?style=for-the-badge&logo=Discord&label=PyBoy)](https://discord.gg/Zrf2nyH)
+[![Discord](https://img.shields.io/discord/584149554132418570?style=for-the-badge&logo=Discord&label=PyBoy)](https://discord.gg/wUbag3KNqQ)
 
 For the more major features, there are the following that you can give a try. They are also described in more detail in the [project list in the Wiki](https://github.com/Baekalfen/PyBoy/wiki/Student-Projects):
 * Hacking games

{pyboy-2.4.0 → pyboy-2.5.0}/README.md

@@ -2,9 +2,9 @@
 <img src="extras/README/pyboy.svg" width="480">
 </p>
 
-__If you have any questions, or just want to chat, [join us on Discord](https://discord.gg/Zrf2nyH).__
+__If you have any questions, or just want to chat, [join us on Discord](https://discord.gg/wUbag3KNqQ).__
 
-[![Discord](https://img.shields.io/discord/584149554132418570?style=for-the-badge&logo=Discord&label=PyBoy)](https://discord.gg/Zrf2nyH)
+[![Discord](https://img.shields.io/discord/584149554132418570?style=for-the-badge&logo=Discord&label=PyBoy)](https://discord.gg/wUbag3KNqQ)
 
 <!---
 Generate GIF with the layout and captions
@@ -98,7 +98,7 @@ If you are looking to make a bot or AI, then these resources are a good place to
    * [Example: Tetris](https://github.com/Baekalfen/PyBoy/wiki/Example-Tetris)
    * [Example: Super Mario Land](https://github.com/Baekalfen/PyBoy/wiki/Example-Super-Mario-Land)
    * [Code Examples](https://github.com/Baekalfen/PyBoy/tree/master/extras/examples)
- * [Discord](https://discord.gg/Zrf2nyH)
+ * [Discord](https://discord.gg/wUbag3KNqQ)
 
 
 When the emulator is running, you can easily access [PyBoy's API](https://baekalfen.github.io/PyBoy/index.html):
@@ -186,9 +186,9 @@ do 3160 hours of gameplay in 1 hour.
 
 Contributing
 ============
-Any contribution is appreciated. The currently known problems are tracked in [the Issues tab](https://github.com/Baekalfen/PyBoy/issues). Feel free to take a swing at any one of them. If you have something original in mind, come and [discuss it on on Discord](https://discord.gg/Zrf2nyH).
+Any contribution is appreciated. The currently known problems are tracked in [the Issues tab](https://github.com/Baekalfen/PyBoy/issues). Feel free to take a swing at any one of them. If you have something original in mind, come and [discuss it on on Discord](https://discord.gg/wUbag3KNqQ).
 
-[![Discord](https://img.shields.io/discord/584149554132418570?style=for-the-badge&logo=Discord&label=PyBoy)](https://discord.gg/Zrf2nyH)
+[![Discord](https://img.shields.io/discord/584149554132418570?style=for-the-badge&logo=Discord&label=PyBoy)](https://discord.gg/wUbag3KNqQ)
 
 For the more major features, there are the following that you can give a try. They are also described in more detail in the [project list in the Wiki](https://github.com/Baekalfen/PyBoy/wiki/Student-Projects):
 * Hacking games

{pyboy-2.4.0 → pyboy-2.5.0}/pyboy/__main__.py

@@ -9,9 +9,10 @@ import copy
 import os
 
 import pyboy
-from pyboy import PyBoy, core, utils
+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__)
 
@@ -20,13 +21,15 @@ INTERNAL_LOADSTATE = "INTERNAL_LOADSTATE_TOKEN"
 
 def color_tuple(string):
     color_palette = [int(c.strip(), 16) for c in string.split(",")]
-    assert len(color_palette) == 4, f"Not the correct amount of colors! Expected four, got {len(color_palette)}"
+    if not (len(color_palette) == 4):
+        raise PyBoyInvalidInputException(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(",")]
-    assert len(color_palette) == 12, f"Not the correct amount of colors! Expected twelve, got {len(color_palette)}"
+    if not (len(color_palette) == 12):
+        raise PyBoyInvalidInputException(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]]
 
 
@@ -37,24 +40,41 @@ def valid_file_path(path):
     return path
 
 
+def valid_volume(vol):
+    if isinstance(vol, bool):
+        return 100 if vol else 0
+    elif vol.isnumeric() and (0 <= int(vol) <= 100):
+        return int(vol)
+    else:
+        raise ValueError("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 = argparse.ArgumentParser(
     description="PyBoy -- Game Boy emulator written in Python",
     epilog="Warning: Features marked with (internal use) might be subject to change.",
 )
 parser.add_argument("ROM", type=valid_file_path, help="Path to a Game Boy compatible ROM file")
 parser.add_argument("-b", "--bootrom", dest="bootrom", type=valid_file_path, help="Path to a boot-ROM file")
+parser.add_argument("--no-input", action="store_true", help="Disable all user-input (mostly for autonomous testing)")
 parser.add_argument(
     "--log-level",
     default=defaults["log_level"],
     type=str,
     choices=["CRITICAL", "ERROR", "WARNING", "INFO", "DEBUG"],
-    help="Set logging level"
+    help="Set logging level",
 )
 parser.add_argument(
     "--color-palette",
     type=color_tuple,
     default=defaults["color_palette"],
-    help=('Four comma seperated, hexadecimal, RGB values for colors (i.e. "FFFFFF,999999,555555,000000")')
+    help=('Four comma seperated, hexadecimal, RGB values for colors (i.e. "FFFFFF,999999,555555,000000")'),
 )
 parser.add_argument(
     "--cgb-color-palette",
@@ -62,7 +82,7 @@ parser.add_argument(
     default=defaults["cgb_color_palette"],
     help=(
         'Three sets of four comma seperated, hexadecimal, RGB values for colors in the order of: background, obj0, obj1 (i.e. "FFFFFF,7BFF31,0063C5,000000,FFFFFF,FF8484,FF8484,000000,FFFFFF,FF8484,FF8484,000000")'
-    )
+    ),
 )
 parser.add_argument(
     "-l",
@@ -74,7 +94,7 @@ parser.add_argument(
     help=(
         "Load state from file. If filepath is specified, it will load the given path. Otherwise, it will automatically "
         "locate a saved state next to the ROM file."
-    )
+    ),
 )
 parser.add_argument(
     "-w",
@@ -82,15 +102,14 @@ parser.add_argument(
     default=defaults["window"],
     type=str,
     choices=["SDL2", "OpenGL", "null"],
-    help="Specify window-type to use"
+    help="Specify window-type to use",
 )
 parser.add_argument("-s", "--scale", default=defaults["scale"], type=int, help="The scaling multiplier for the window")
-parser.add_argument("--sound", action="store_true", help="Enable sound (beta)")
 parser.add_argument("--no-renderer", action="store_true", help="Disable rendering (internal use)")
 parser.add_argument(
     "--gameshark",
     type=str,
-    help="Add GameShark cheats on start-up. Add multiple by comma separation (i.e. '010138CD, 01033CD1')"
+    help="Add GameShark cheats on start-up. Add multiple by comma separation (i.e. '010138CD, 01033CD1')",
 )
 
 gameboy_type_parser = parser.add_mutually_exclusive_group()
@@ -101,6 +120,39 @@ gameboy_type_parser.add_argument(
     "--cgb", action="store_const", const=True, dest="cgb", help="Force emulator to run as Game Boy Color"
 )
 
+# NOTE: Inverted logic on variable
+parser.add_argument(
+    "--no-sound-emulation",
+    default=True,
+    action="store_false",
+    dest="sound_emulated",
+    help="Disables sound emulation (not just muted!)",
+)
+
+sound_parser = parser.add_mutually_exclusive_group()
+
+sound_parser.add_argument(
+    "--sound",
+    action="store_const",
+    const=100,
+    dest="sound_volume",
+    help="Deprecated setting. Now sets sound volume to 100%. See '--sound-volume'",
+)
+sound_parser.add_argument(
+    "--sound-volume",
+    default=100,
+    type=valid_volume,
+    help="Set sound volume in percent (0-100)",
+)
+parser.set_defaults(sound_volume=100)
+
+parser.add_argument(
+    "--sound-sample-rate",
+    default=None,
+    type=valid_sample_rate,
+    help="Set sound sample rate. Has to be divisible in 60.",
+)
+
 for arguments in parser_arguments():
     for a in arguments:
         *args, kwargs = a
@@ -154,6 +206,9 @@ See "pyboy --help" for how to enable rewind and other awesome features!
     kwargs.pop("ROM", None)
     kwargs.pop("loadstate", None)
     kwargs.pop("no_renderer", None)
+    if kwargs.pop("sound_emulated", None) is False:
+        # This disables the entire sound emulation, not just muting the sound.
+        kwargs["sound"] = False
     pyboy = PyBoy(argv.ROM, **kwargs)
 
     if argv.loadstate is not None:
@@ -168,7 +223,6 @@ See "pyboy --help" for how to enable rewind and other awesome features!
         with open(state_path, "rb") as f:
             pyboy.load_state(f)
 
-    render = not argv.no_renderer
     while pyboy.tick():
         pass
 

{pyboy-2.4.0 → pyboy-2.5.0}/pyboy/api/__init__.py

@@ -17,4 +17,11 @@ from .tilemap import TileMap
 #     "constants": False,
 #     "manager": False,
 # }
-# __all__ = ["API"]
+__all__ = [
+    "constants",
+    "GameShark",
+    "Screen",
+    "Sprite",
+    "Tile",
+    "TileMap",
+]

pyboy-2.5.0/pyboy/api/gameshark.pxd

@@ -0,0 +1,24 @@
+#
+# License: See LICENSE.md file
+# GitHub: https://github.com/Baekalfen/PyBoy
+#
+
+from libc.stdint cimport uint8_t, int64_t
+
+from pyboy.logging.logging cimport Logger
+
+
+cdef Logger logger
+
+cdef class GameShark:
+    cdef object memory
+    cdef dict cheats
+    cdef bint enabled
+
+    cdef int64_t _get_value(self, int, int) except -1
+    cdef int64_t _set_value(self, int, int, int) except -1
+    cdef tuple _convert_cheat(self, str code)
+    cpdef int64_t add(self, str code) except -1
+    cpdef int64_t remove(self, str code, bint restore_value=*) except -1
+    cpdef int64_t clear_all(self, bint restore_value=*) except -1
+    cdef int64_t tick(self) except -1 with gil

{pyboy-2.4.0 → pyboy-2.5.0}/pyboy/api/gameshark.py

@@ -4,9 +4,14 @@
 #
 
 from pyboy.logging import get_logger
+from pyboy.utils import PyBoyInvalidInputException
 
 logger = get_logger(__name__)
 
+__pdoc__ = {
+    "GameShark.tick": False,
+}
+
 
 class GameShark:
     def __init__(self, memory):
@@ -15,7 +20,7 @@ class GameShark:
         self.enabled = False
 
     def _convert_cheat(self, gameshark_code):
-        '''
+        """
         A GameShark code for these consoles is written in the format ttvvaaaa. tt specifies the type, which is usually 01.
         vv specifies the hexadecimal value the code will write into the game's memory. aaaa specifies the memory address
         that will be modified, with the low byte first (e.g. address C056 is written as 56C0).
@@ -28,18 +33,18 @@ class GameShark:
         https://doc.kodewerx.org/hacking_gb.html
 
         There seems to be conflicting information about the presence of other types than 01.
-        '''
+        """
         # Check if the input cheat code has the correct length (8 characters)
         if len(gameshark_code) != 8:
             raise ValueError("Invalid cheat code length. Cheat code must be 8 characters long.")
 
         # Extract components from the cheat code
         _type = int(gameshark_code[:2], 16)
-        value = int(gameshark_code[2:4], 16) # Convert hexadecimal value to an integer
-        unconverted_address = gameshark_code[4:] # Ex:   1ED1
-        lower = unconverted_address[:2] # Ex:  1E
-        upper = unconverted_address[2:] # Ex:  D1
-        address_converted = upper + lower # Ex: 0xD11E   # Converting to Ram Readable address
+        value = int(gameshark_code[2:4], 16)  # Convert hexadecimal value to an integer
+        unconverted_address = gameshark_code[4:]  # Ex:   1ED1
+        lower = unconverted_address[:2]  # Ex:  1E
+        upper = unconverted_address[2:]  # Ex:  D1
+        address_converted = upper + lower  # Ex: 0xD11E   # Converting to Ram Readable address
         address = int(address_converted, 16)
 
         if not 0x8000 <= address:
@@ -100,7 +105,7 @@ class GameShark:
         if code not in self.cheats:
             self.cheats[code] = (self._get_value(_type, address), (_type, value, address))
         else:
-            logger.error("GameShark code already applied!")
+            raise PyBoyInvalidInputException("GameShark code already applied!")
 
     def remove(self, code, restore_value=True):
         """
@@ -117,7 +122,7 @@ class GameShark:
             restore_value (bool): True to restore original value at address, otherwise don't restore
         """
 
-        if not code in self.cheats:
+        if code not in self.cheats:
             raise ValueError("GameShark code cannot be removed. Hasn't been applied.")
 
         original_value, (_type, _, address) = self.cheats.pop(code)
@@ -145,7 +150,7 @@ class GameShark:
 
     def tick(self):
         if not self.enabled:
-            return
+            return 0
         # https://gbdev.io/pandocs/Shark_Cheats.html
         # "As far as it is understood, patching is implemented by hooking the original VBlank interrupt handler, and
         # re-writing RAM values each frame."

{pyboy-2.4.0 → pyboy-2.5.0}/pyboy/api/memory_scanner.pxd

@@ -7,5 +7,5 @@ cdef class MemoryScanner:
     cdef int _memory_cache_byte_width
 
     cpdef list rescan_memory(self, object new_value=*, dynamic_comparison_type=*, byteorder=*)
-    cpdef list scan_memory(self, object target_value=*, int start_addr=*, int end_addr=*, standard_comparison_type=*, value_type=*, int byte_width=*, byteorder=*) noexcept
+    cpdef list scan_memory(self, object target_value=*, int start_addr=*, int end_addr=*, standard_comparison_type=*, value_type=*, int byte_width=*, byteorder=*)
     cpdef bint _check_value(self, uint64_t, uint64_t, int)noexcept

{pyboy-2.4.0 → pyboy-2.5.0}/pyboy/api/memory_scanner.py

@@ -5,6 +5,7 @@ from pyboy.utils import bcd_to_dec
 
 class StandardComparisonType(Enum):
     """Enumeration for defining types of comparisons that do not require a previous value."""
+
     EXACT = 1
     LESS_THAN = 2
     GREATER_THAN = 3
@@ -14,6 +15,7 @@ class StandardComparisonType(Enum):
 
 class DynamicComparisonType(Enum):
     """Enumeration for defining types of comparisons that require a previous value."""
+
     UNCHANGED = 1
     CHANGED = 2
     INCREASED = 3
@@ -23,12 +25,14 @@ class DynamicComparisonType(Enum):
 
 class ScanMode(Enum):
     """Enumeration for defining scanning modes."""
+
     INT = 1
     BCD = 2
 
 
-class MemoryScanner():
+class MemoryScanner:
     """A class for scanning memory within a given range."""
+
     def __init__(self, pyboy):
         self.pyboy = pyboy
         self._memory_cache = {}
@@ -42,7 +46,7 @@ class MemoryScanner():
         standard_comparison_type=StandardComparisonType.EXACT,
         value_type=ScanMode.INT,
         byte_width=1,
-        byteorder="little"
+        byteorder="little",
     ):
         """
         This function scans a specified range of memory for a target value from the `start_addr` to the `end_addr` (both included).
@@ -69,9 +73,11 @@ class MemoryScanner():
         """
         self._memory_cache = {}
         self._memory_cache_byte_width = byte_width
-        for addr in range(start_addr, end_addr - (byte_width-1) + 1): # Adjust the loop to prevent reading past end_addr
+        for addr in range(
+            start_addr, end_addr - (byte_width - 1) + 1
+        ):  # Adjust the loop to prevent reading past end_addr
             # Read multiple bytes based on byte_width and byteorder
-            value_bytes = self.pyboy.memory[addr:addr + byte_width]
+            value_bytes = self.pyboy.memory[addr : addr + byte_width]
             value = int.from_bytes(value_bytes, byteorder)
 
             if value_type == ScanMode.BCD:
@@ -113,30 +119,30 @@ class MemoryScanner():
         """
         for addr, value in self._memory_cache.copy().items():
             current_value = int.from_bytes(
-                self.pyboy.memory[addr:addr + self._memory_cache_byte_width], byteorder=byteorder
+                self.pyboy.memory[addr : addr + self._memory_cache_byte_width], byteorder=byteorder
             )
-            if (dynamic_comparison_type == DynamicComparisonType.UNCHANGED):
+            if dynamic_comparison_type == DynamicComparisonType.UNCHANGED:
                 if value != current_value:
                     self._memory_cache.pop(addr)
                 else:
                     self._memory_cache[addr] = current_value
-            elif (dynamic_comparison_type == DynamicComparisonType.CHANGED):
+            elif dynamic_comparison_type == DynamicComparisonType.CHANGED:
                 if value == current_value:
                     self._memory_cache.pop(addr)
                 else:
                     self._memory_cache[addr] = current_value
-            elif (dynamic_comparison_type == DynamicComparisonType.INCREASED):
+            elif dynamic_comparison_type == DynamicComparisonType.INCREASED:
                 if value >= current_value:
                     self._memory_cache.pop(addr)
                 else:
                     self._memory_cache[addr] = current_value
-            elif (dynamic_comparison_type == DynamicComparisonType.DECREASED):
+            elif dynamic_comparison_type == DynamicComparisonType.DECREASED:
                 if value <= current_value:
                     self._memory_cache.pop(addr)
                 else:
                     self._memory_cache[addr] = current_value
-            elif (dynamic_comparison_type == DynamicComparisonType.MATCH):
-                if new_value == None:
+            elif dynamic_comparison_type == DynamicComparisonType.MATCH:
+                if new_value is None:
                     raise ValueError("new_value must be specified when using DynamicComparisonType.MATCH")
                 if current_value != new_value:
                     self._memory_cache.pop(addr)

{pyboy-2.4.0 → pyboy-2.5.0}/pyboy/api/screen.pxd

@@ -11,13 +11,12 @@ from pyboy.core.mb cimport Motherboard
 
 cdef class Screen:
     cdef Motherboard mb
-    cpdef ((int, int), (int, int)) get_tilemap_position(self)
+    cpdef ((int, int), (int, int)) get_tilemap_position(self) noexcept
     # cdef readonly list tilemap_position_list
     # cdef readonly uint8_t[:,:] tilemap_position_list
     cdef readonly uint32_t[:,:] raw_buffer
     cdef readonly (int, int) raw_buffer_dims
     cdef readonly str raw_buffer_format
-    # cdef readonly uint8_t[144][160][4] memoryview
-    # cpdef np.ndarray[np.uint8_t, ndim=3] get_ndarray(self)
+
     cdef readonly object ndarray
     cdef readonly object image

{pyboy-2.4.0 → pyboy-2.5.0}/pyboy/api/screen.py

@@ -29,6 +29,7 @@ class Screen:
     If you're making an AI or bot, it's highly recommended to _not_ use this class for detecting objects on the screen.
     It's much more efficient to use `pyboy.PyBoy.tilemap_background`, `pyboy.PyBoy.tilemap_window`, and `pyboy.PyBoy.get_sprite` instead.
     """
+
     def __init__(self, mb):
         self.mb = mb
 
@@ -53,8 +54,8 @@ class Screen:
 
         Returns
         -------
-        bytes:
-            92160 bytes of screen data in a `bytes` object.
+        memoryview:
+            92160 bytes memoryview of screen data.
         """
         self.raw_buffer_dims = self.mb.lcd.renderer.buffer_dims
         """
@@ -119,7 +120,8 @@ class Screen:
             RGB image of (160, 144) pixels
         """
         if not Image:
-            logger.warning("Cannot generate screen image. Missing dependency \"Pillow\".")
+            logger.warning('Cannot generate screen image. Missing dependency "Pillow".')
+            self.image = utils.PillowImportError()
         else:
             self._set_image()
 
@@ -164,14 +166,15 @@ class Screen:
 
     def _set_image(self):
         self.image = Image.frombuffer(
-            self.mb.lcd.renderer.color_format, self.mb.lcd.renderer.buffer_dims[::-1],
-            self.mb.lcd.renderer._screenbuffer_raw
+            self.mb.lcd.renderer.color_format,
+            self.mb.lcd.renderer.buffer_dims[::-1],
+            self.mb.lcd.renderer._screenbuffer_raw,
         )
 
     @property
     def tilemap_position_list(self):
         """
-        This function provides the screen (SCX, SCY) and window (WX. WY) position for each horizontal line in the
+        This function provides the screen (SCX, SCY) and window (WX, WY) position for each horizontal line in the
         screen buffer. These parameters are often used for visual effects, and some games will reset the registers at
         the end of each call to `pyboy.PyBoy.tick()`.
 
@@ -181,18 +184,18 @@ class Screen:
         ```python
         >>> pyboy.tick(25)
         True
-        >>> swoosh = pyboy.screen.tilemap_position_list[67:78]
+        >>> swoosh = pyboy.screen.tilemap_position_list[66:77]
         >>> print(*swoosh, sep=newline) # Just to pretty-print it
         [0, 0, -7, 0]
         [1, 0, -7, 0]
         [2, 0, -7, 0]
         [2, 0, -7, 0]
-        [3, 0, -7, 0]
-        [3, 0, -7, 0]
+        [2, 0, -7, 0]
         [3, 0, -7, 0]
         [3, 0, -7, 0]
         [2, 0, -7, 0]
         [1, 0, -7, 0]
+        [1, 0, -7, 0]
         [0, 0, -7, 0]
 
         ```
@@ -204,7 +207,7 @@ class Screen:
         """
 
         if self.mb.lcd._LCDC.lcd_enable:
-            return [[line[0], line[1], line[2], line[3]] for line in self.mb.lcd._scanlineparameters]
+            return [[line[0], line[1], line[2] - 7, line[3]] for line in self.mb.lcd._scanlineparameters]
         else:
             return [[0, 0, 0, 0] for line in range(144)]
 

pyboy-2.5.0/pyboy/api/sound.pxd

@@ -0,0 +1,17 @@
+#
+# License: See LICENSE.md file
+# GitHub: https://github.com/Baekalfen/PyBoy
+#
+
+from libc.stdint cimport uint64_t, int8_t
+from pyboy.core.mb cimport Motherboard
+
+cdef class Sound:
+    cdef Motherboard mb
+    cdef readonly uint64_t sample_rate
+
+    cdef readonly int8_t[:] raw_buffer
+    cdef readonly (int, int) raw_buffer_dims
+    cdef readonly str raw_buffer_format
+    cdef readonly int raw_buffer_length
+    cdef readonly object raw_ndarray