Merge 'Fix file select screen displaying None in the song name display when having Background music set to No music' (#2252)

# Conflicts:
#	Cosmetics.py

Author: fenhl

Cosmetics.py

@@ -988,11 +988,14 @@ def patch_song_names(rom: Rom, settings: Settings, log: CosmeticsLog, symbols: d
     for index, song_name in enumerate(log.bgm.values()):
         if index >= 47:
             break
-        if len(song_name) > 50:
-            song_name_cropped = song_name[:50]
-            text_bytes = [ord('?' if ord(c) >= 0x80 else c) for c in song_name_cropped]
+        if song_name == 'None':
+            text_bytes = [ord('\0')] * 50
         else:
-            text_bytes = [ord('?' if ord(c) >= 0x80 else c) for c in song_name] + [ord('\0')] * (50 - len(song_name))
+            if len(song_name) > 50:
+                song_name_cropped = song_name[:50]
+                text_bytes = [ord('?' if ord(c) >= 0x80 else c) for c in song_name_cropped]
+            else:
+                text_bytes = [ord('?' if ord(c) >= 0x80 else c) for c in song_name] + [ord('\0')] * (50 - len(song_name))
         bytes_to_write += text_bytes
     rom.write_bytes(symbols['CFG_SONG_NAMES'], bytes_to_write)
     log.display_custom_song_names = settings.display_custom_song_names

version.py

@@ -1,4 +1,4 @@
-__version__ = '8.1.60'
+__version__ = '8.1.61'
 
 # This is a supplemental version number for branches based off of main dev.
 supplementary_version = 0