From 9af149971f03f0f86f02dd40ff074bc4ba6a285f Mon Sep 17 00:00:00 2001
From: RetiredWizard <github@retiredwizard.com>
Date: Fri, 1 Aug 2025 19:58:54 -0400
Subject: [PATCH] Generalizations for Fruit Jam

---
 Metro/Metro_RP2350_Chips_Challenge/code.py    | 33 ++++++++++---------
 Metro/Metro_RP2350_Chips_Challenge/game.py    |  4 +--
 .../Metro_RP2350_Chips_Challenge/savestate.py |  8 +++++
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/Metro/Metro_RP2350_Chips_Challenge/code.py b/Metro/Metro_RP2350_Chips_Challenge/code.py
index 9c39e5a4d..5cea09eee 100755
--- a/Metro/Metro_RP2350_Chips_Challenge/code.py
+++ b/Metro/Metro_RP2350_Chips_Challenge/code.py
@@ -21,20 +21,20 @@ from definitions import SECOND_LENGTH, TICKS_PER_SECOND
 DATA_FILE = "CHIPS.DAT"
 
 SOUND_EFFECTS = {
-    "BUTTON_PUSHED": "/sounds/pop2.wav",
-    "DOOR_OPENED": "/sounds/door.wav",
-    "ITEM_COLLECTED": "/sounds/blip2.wav",
-    "BOOTS_STOLEN": "/sounds/strike.wav",
-    "WATER_SPLASH": "/sounds/water2.wav",
-    "TELEPORT": "/sounds/teleport.wav",
-    "CANT_MOVE": "/sounds/oof3.wav",
-    "CHIP_LOSES": "/sounds/bummer.wav",
-    "LEVEL_COMPLETE": "/sounds/ditty1.wav",
-    "IC_COLLECTED": "/sounds/click3.wav",
-    "BOMB_EXPLOSION": "/sounds/hit3.wav",
-    "SOCKET_SOUND": "/sounds/chimes.wav",
-    "TIME_LOW_TICK": "/sounds/click1.wav",
-    "TIME_UP": "/sounds/bell.wav"
+    "BUTTON_PUSHED": "sounds/pop2.wav",
+    "DOOR_OPENED": "sounds/door.wav",
+    "ITEM_COLLECTED": "sounds/blip2.wav",
+    "BOOTS_STOLEN": "sounds/strike.wav",
+    "WATER_SPLASH": "sounds/water2.wav",
+    "TELEPORT": "sounds/teleport.wav",
+    "CANT_MOVE": "sounds/oof3.wav",
+    "CHIP_LOSES": "sounds/bummer.wav",
+    "LEVEL_COMPLETE": "sounds/ditty1.wav",
+    "IC_COLLECTED": "sounds/click3.wav",
+    "BOMB_EXPLOSION": "sounds/hit3.wav",
+    "SOCKET_SOUND": "sounds/chimes.wav",
+    "TIME_LOW_TICK": "sounds/click1.wav",
+    "TIME_UP": "sounds/bell.wav"
 }
 
 displayio.release_displays()
@@ -45,7 +45,10 @@ dac.configure_clocks(sample_rate=44100, bit_depth=16)
 dac.headphone_output = True
 dac.headphone_volume = -15  # dB
 
-audio_bus = audiobusio.I2SOut(board.D9, board.D10, board.D11)
+try:
+    audio_bus = audiobusio.I2SOut(board.I2S_BCLK, board.I2S_WS, board.I2S_DIN)
+except:
+    audio_bus = audiobusio.I2SOut(board.D9, board.D10, board.D11)
 audio = Audio(audio_bus, SOUND_EFFECTS)
 
 fb = picodvi.Framebuffer(320, 240, clk_dp=board.CKP, clk_dn=board.CKN,
diff --git a/Metro/Metro_RP2350_Chips_Challenge/game.py b/Metro/Metro_RP2350_Chips_Challenge/game.py
index b66392626..4d4c646a9 100755
--- a/Metro/Metro_RP2350_Chips_Challenge/game.py
+++ b/Metro/Metro_RP2350_Chips_Challenge/game.py
@@ -26,8 +26,8 @@ from savestate import SaveState
 from microcontroller import nvm
 
 # Colors must be colors in palette
-LARGE_FONT = bitmap_font.load_font("/fonts/Arial-Bold-10.pcf")
-SMALL_FONT = bitmap_font.load_font("/fonts/Arial-8.pcf")
+LARGE_FONT = bitmap_font.load_font("fonts/Arial-Bold-10.pcf")
+SMALL_FONT = bitmap_font.load_font("fonts/Arial-8.pcf")
 
 colors = {
     "key_color": 0xAAFF00, # Light Green
diff --git a/Metro/Metro_RP2350_Chips_Challenge/savestate.py b/Metro/Metro_RP2350_Chips_Challenge/savestate.py
index c45c37bff..cac02db9f 100755
--- a/Metro/Metro_RP2350_Chips_Challenge/savestate.py
+++ b/Metro/Metro_RP2350_Chips_Challenge/savestate.py
@@ -24,6 +24,14 @@ class SaveState:
         self._sdcard = None
 
     def _mount_sd_card(self):
+
+        # Check if the SD card is already mounted
+        try:
+            storage.remount('/sd',readonly=False)
+            return True
+        except:
+            pass
+
         self._card_detect = DigitalInOut(board.SD_CARD_DETECT)
         self._card_detect.switch_to_input(pull=Pull.UP)
         if self._card_detect.value: