pyboy 2.5.1__tar.gz → 2.5.2__tar.gz

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pyboy
-Version: 2.5.1
+Version: 2.5.2
 Summary: Game Boy emulator written in Python
 Author-email: Mads Ynddal <mads@ynddal.dk>
 License: GNU Lesser General Public License
@@ -188,6 +188,7 @@ Requires-Dist: pyopengl; extra == "all"
 Requires-Dist: markdown; extra == "all"
 Requires-Dist: pdoc3; extra == "all"
 Requires-Dist: gym; extra == "all"
+Dynamic: license-file
 
 <p align="center">
 <img src="extras/README/pyboy.svg" width="480">

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

@@ -136,7 +136,7 @@ sound_parser.add_argument(
     action="store_const",
     const=100,
     dest="sound_volume",
-    help="Deprecated setting. Now sets sound volume to 100%. See '--sound-volume'",
+    help="Deprecated setting. Now sets sound volume to 100%%. See '--sound-volume'",
 )
 sound_parser.add_argument(
     "--sound-volume",

{pyboy-2.5.1 → pyboy-2.5.2}/pyboy/core/cartridge/rtc.py

@@ -78,7 +78,7 @@ class RTC:
                 self.latch_rtc()
             self.latch_enabled = True
         else:
-            logger.warning("Invalid RTC command: %0.2x", value)
+            logger.debug("Invalid RTC command: %0.2x", value)
 
     def getregister(self, register):
         if not self.latch_enabled:
@@ -98,7 +98,7 @@ class RTC:
             day_carry = self.day_carry << 7
             return day_high + halt + day_carry
         else:
-            logger.warning("Invalid RTC register: %0.4x", register)
+            logger.debug("Invalid RTC register: %0.4x", register)
 
     def setregister(self, register, value):
         if not self.latch_enabled:
@@ -126,9 +126,9 @@ class RTC:
             if self.halt == 0:
                 pass  # TODO: Start the timer
             else:
-                logger.warning("Stopping RTC is not implemented!")
+                logger.debug("Stopping RTC is not implemented!")
 
             self.timezero = self.timezero - (t // 3600 // 24) - (day_high << 8)
             self.day_carry = day_carry
         else:
-            logger.warning("Invalid RTC register: %0.4x %0.2x", register, value)
+            logger.debug("Invalid RTC register: %0.4x %0.2x", register, value)

{pyboy-2.5.1 → pyboy-2.5.2}/pyboy/logging/__init__.py

@@ -6,7 +6,7 @@
     CRITICAL,
 ) = range(5)
 
-_log_level = ERROR
+_log_level = WARNING
 
 
 def get_log_level():

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

@@ -14,7 +14,7 @@ from pyboy.api import Sprite, constants
 from pyboy.api.tilemap import TileMap
 from pyboy.plugins.base_plugin import PyBoyWindowPlugin
 from pyboy.plugins.window_sdl2 import sdl2_event_pump
-from pyboy.utils import WindowEvent
+from pyboy.utils import WindowEvent, PyBoyAssertException
 
 try:
     import sdl2
@@ -78,8 +78,8 @@ class Debug(PyBoyWindowPlugin):
             return
 
         self.sdl2_event_pump = self.pyboy_argv.get("window") != "SDL2"
-        if self.sdl2_event_pump:
-            sdl2.SDL_Init(sdl2.SDL_INIT_VIDEO)
+        if self.sdl2_event_pump and sdl2.SDL_InitSubSystem(sdl2.SDL_INIT_VIDEO) < 0:
+            raise PyBoyAssertException(f"SDL_InitSubSystem video failed: {sdl2.SDL_GetError().decode()}")
 
         # self.scale = 2
         window_pos = 0
@@ -210,7 +210,7 @@ class Debug(PyBoyWindowPlugin):
             for _ in range(3):  # At least 2 to close
                 get_events()
                 time.sleep(0.1)
-            sdl2.SDL_Quit()
+            sdl2.SDL_QuitSubSystem(sdl2.SDL_INIT_VIDEO)
 
     def enabled(self):
         if self.pyboy_argv.get("debug"):
@@ -742,11 +742,11 @@ class MemoryWindow(BaseDebugWindow):
         self.dst.y = y
         for i, c in enumerate(text):
             if not 0 <= c < 256:
-                logger.warning(f"Invalid character {c} in {bytes(text).decode('cp437')}")  # This may error too...
+                logger.debug(f"Invalid character {c} in {bytes(text).decode('cp437')}")  # This may error too...
                 c = 0
             self.src.y = 16 * c
             if self.dst.x > self.width - 8:
-                logger.warning(f"Text overrun while printing {bytes(text).decode('cp437')}")
+                logger.debug(f"Text overrun while printing {bytes(text).decode('cp437')}")
                 break
             sdl2.SDL_RenderCopy(self._sdlrenderer, self.font_texture, self.src, self.dst)
             self.dst.x += 8

{pyboy-2.5.1 → pyboy-2.5.2}/pyboy/plugins/game_wrapper_kirby_dream_land.py

@@ -98,6 +98,7 @@ class GameWrapperKirbyDreamLand(PyBoyGameWrapper):
         Kwargs:
             * timer_div (int): Replace timer's DIV register with this value. Use `None` to randomize.
         """
+        self._game_over = False
         PyBoyGameWrapper.reset_game(self, timer_div=timer_div)
 
     def game_area(self):

{pyboy-2.5.1 → pyboy-2.5.2}/pyboy/plugins/game_wrapper_pokemon_pinball.py

@@ -228,7 +228,7 @@ class BallType(Enum):
     POKEBALL = 0
     GREATBALL = 2
     ULTRABALL = 3
-    MASTERBALL = 4
+    MASTERBALL = 5
 
 
 class BallSize(Enum):

{pyboy-2.5.1 → pyboy-2.5.2}/pyboy/plugins/window_sdl2.py

@@ -8,7 +8,7 @@ import time
 from ctypes import POINTER, c_ubyte, c_void_p, cast
 
 from pyboy.plugins.base_plugin import PyBoyWindowPlugin
-from pyboy.utils import WindowEvent, WindowEventMouse, cython_compiled
+from pyboy.utils import WindowEvent, WindowEventMouse, cython_compiled, PyBoyAssertException
 
 try:
     import sdl2
@@ -162,7 +162,9 @@ class WindowSDL2(PyBoyWindowPlugin):
 
         if not self.enabled():
             return
-        assert sdl2.SDL_Init(sdl2.SDL_INIT_VIDEO | sdl2.SDL_INIT_GAMECONTROLLER) >= 0
+
+        if sdl2.SDL_InitSubSystem(sdl2.SDL_INIT_VIDEO | sdl2.SDL_INIT_GAMECONTROLLER) < 0:
+            raise PyBoyAssertException("SDL_InitSubSystem video failed: %s", sdl2.SDL_GetError().decode())
 
         self._window = sdl2.SDL_CreateWindow(
             b"PyBoy",
@@ -188,7 +190,7 @@ class WindowSDL2(PyBoyWindowPlugin):
 
     def init_audio(self, mb):
         if mb.sound.emulate:
-            if sdl2.SDL_Init(sdl2.SDL_INIT_AUDIO) >= 0:
+            if sdl2.SDL_InitSubSystem(sdl2.SDL_INIT_AUDIO) >= 0:
                 # NOTE: We have to keep spec variables alive to avoid segfault
                 self.spec_want = sdl2.SDL_AudioSpec(self.mb.sound.sample_rate, sdl2.AUDIO_S8, 2, 128)
                 self.spec_have = sdl2.SDL_AudioSpec(0, 0, 0, 0)
@@ -217,7 +219,7 @@ class WindowSDL2(PyBoyWindowPlugin):
                     logger.warning("SDL_OpenAudioDevice failed: %s", sdl2.SDL_GetError().decode())
             else:
                 self.sound_support = False
-                logger.warning("SDL_Init audio failed: %s", sdl2.SDL_GetError().decode())
+                logger.warning("SDL_InitSubSystem audio failed: %s", sdl2.SDL_GetError().decode())
         else:
             self.sound_support = False
 
@@ -303,4 +305,4 @@ class WindowSDL2(PyBoyWindowPlugin):
             for _ in range(3):  # At least 2 to close
                 get_events()
                 time.sleep(0.1)
-            sdl2.SDL_Quit()
+            sdl2.SDL_QuitSubSystem(sdl2.SDL_INIT_VIDEO | sdl2.SDL_INIT_GAMECONTROLLER)

{pyboy-2.5.1 → pyboy-2.5.2}/pyboy/pyboy.py

@@ -67,7 +67,7 @@ defaults = {
     ),
     "scale": 3,
     "window": "SDL2",
-    "log_level": "ERROR",
+    "log_level": "WARNING",
 }
 
 

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pyboy
-Version: 2.5.1
+Version: 2.5.2
 Summary: Game Boy emulator written in Python
 Author-email: Mads Ynddal <mads@ynddal.dk>
 License: GNU Lesser General Public License
@@ -188,6 +188,7 @@ Requires-Dist: pyopengl; extra == "all"
 Requires-Dist: markdown; extra == "all"
 Requires-Dist: pdoc3; extra == "all"
 Requires-Dist: gym; extra == "all"
+Dynamic: license-file
 
 <p align="center">
 <img src="extras/README/pyboy.svg" width="480">

{pyboy-2.5.1 → pyboy-2.5.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyboy"
-version = "2.5.1"
+version = "2.5.2"
 authors = [
     {name = "Mads Ynddal", email = "mads@ynddal.dk"}
 ]