Generic game wrapper enables start_game and reset_game

Baekalfen · Feb 11, 2024 · 2acfb7e · 2acfb7e
1 parent 8a4e9a4
commit 2acfb7e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/pyboy/plugins/base_plugin.py b/pyboy/plugins/base_plugin.py
@@ -157,6 +157,9 @@ def start_game(self, timer_div=None):
 
         if not self.pyboy.frame_count == 0:
             logger.warning("Calling start_game from an already running game. This might not work.")
+        self.game_has_started = True
+        self.saved_state.seek(0)
+        self.pyboy.save_state(self.saved_state)
 
     def reset_game(self, timer_div=None):
         """

diff --git a/pyboy/plugins/game_wrapper_kirby_dream_land.py b/pyboy/plugins/game_wrapper_kirby_dream_land.py
@@ -90,8 +90,6 @@ def start_game(self, timer_div=None):
         # Wait for transition to finish (exit level intro screen, enter game)
         self.pyboy.tick(60, False)
 
-        self.game_has_started = True
-
         self.saved_state.seek(0)
         self.pyboy.save_state(self.saved_state)
 

diff --git a/pyboy/plugins/game_wrapper_super_mario_land.py b/pyboy/plugins/game_wrapper_super_mario_land.py
@@ -232,7 +232,7 @@ def start_game(self, timer_div=None, world_level=None, unlock_level_select=False
             # "MARIO" in the title bar and 0 is placed at score
             if self.tilemap_background[0:5, 0] == [278, 266, 283, 274, 280] and \
                self.tilemap_background[5, 1] == 256:
-                self.game_has_started = True
+                # Game has started
                 break
 
         self.saved_state.seek(0)

diff --git a/pyboy/plugins/game_wrapper_tetris.py b/pyboy/plugins/game_wrapper_tetris.py
@@ -125,8 +125,6 @@ def start_game(self, timer_div=None):
         self.saved_state.seek(0)
         self.pyboy.save_state(self.saved_state)
 
-        self.game_has_started = True
-
         self.reset_game(timer_div=timer_div)
 
     def reset_game(self, timer_div=None):