diff --git a/.github/01.png b/.github/01.png index e31289c..01c32ef 100644 Binary files a/.github/01.png and b/.github/01.png differ diff --git a/FlashGBX/FlashGBX_CLI.py b/FlashGBX/FlashGBX_CLI.py index d203af8..6aed23a 100644 --- a/FlashGBX/FlashGBX_CLI.py +++ b/FlashGBX/FlashGBX_CLI.py @@ -1075,7 +1075,7 @@ class FlashGBX_CLI(): if self.CONN.GetMode() == "AGB": print("Using Save Type “{:s}”.".format(Util.AGB_Header_Save_Types[save_type])) elif self.CONN.GetMode() == "DMG": - if rtc and header["mapper_raw"] in (0x10, 0xFE): # RTC of MBC3, HuC-3 + if rtc and header["mapper_raw"] in (0x10, 0x110, 0xFE): # RTC of MBC3, HuC-3 print("Real Time Clock register values will also be written if applicable/possible.") try: diff --git a/FlashGBX/FlashGBX_GUI.py b/FlashGBX/FlashGBX_GUI.py index 2af6804..6026f5b 100644 --- a/FlashGBX/FlashGBX_GUI.py +++ b/FlashGBX/FlashGBX_GUI.py @@ -1411,7 +1411,7 @@ class FlashGBX_GUI(QtWidgets.QWidget): rtc = False if self.CONN.INFO["has_rtc"]: - if self.CONN.GetMode() == "DMG" and mbc == 0x10 and not self.CONN.IsClkConnected(): + if self.CONN.GetMode() == "DMG" and mbc in (0x10, 0x110) and not self.CONN.IsClkConnected(): rtc = False else: msg = "A Real Time Clock cartridge was detected. Do you want the cartridge’s Real Time Clock register values also to be saved?" @@ -1546,9 +1546,9 @@ class FlashGBX_GUI(QtWidgets.QWidget): rtc = False rtc_advance = False if not test and self.CONN.INFO["has_rtc"]: - if self.CONN.GetMode() == "DMG" and mbc == 0x10 and not self.CONN.IsClkConnected(): + if self.CONN.GetMode() == "DMG" and mbc in (0x10, 0x110) and not self.CONN.IsClkConnected(): rtc = False - elif (self.CONN.GetMode() == "DMG" and ((mbc == 0xFD and (filesize == save_size + 0x28 or erase)) or (mbc == 0xFE and (filesize == save_size + 0xC or erase)) or (self.CONN.IsClkConnected() and mbc == 0x10 and filesize == save_size + 0x30 or erase))) or \ + elif (self.CONN.GetMode() == "DMG" and ((mbc == 0xFD and (filesize == save_size + 0x28 or erase)) or (mbc == 0xFE and (filesize == save_size + 0xC or erase)) or (self.CONN.IsClkConnected() and mbc in (0x10, 0x110) and filesize == save_size + 0x30 or erase))) or \ (self.CONN.GetMode() == "AGB" and (filesize == save_size + 0x10 or erase)): msg = "A Real Time Clock cartridge was detected. Do you want the Real Time Clock register values to be also written?" cb = QtWidgets.QCheckBox("&Adjust RTC", checked=True) diff --git a/FlashGBX/Mapper.py b/FlashGBX/Mapper.py index 1626b15..d11b042 100644 --- a/FlashGBX/Mapper.py +++ b/FlashGBX/Mapper.py @@ -267,9 +267,6 @@ class DMG_MBC3(DMG_MBC): def HasRTC(self): dprint("Checking for RTC") - if self.MBC_ID != 16: - dprint("No RTC because wrong MBC ID", self.MBC_ID) - return False self.EnableRAM(enable=False) self.EnableRAM(enable=True) self.LatchRTC() diff --git a/FlashGBX/Util.py b/FlashGBX/Util.py index 9a3312b..f6fdd31 100644 --- a/FlashGBX/Util.py +++ b/FlashGBX/Util.py @@ -9,7 +9,7 @@ from enum import Enum APPNAME = "FlashGBX" VERSION_PEP440 = "3.25" VERSION = "v{:s}".format(VERSION_PEP440) -VERSION_TIMESTAMP = 1681494424 +VERSION_TIMESTAMP = 1681495829 DEBUG = False DEBUG_LOG = [] APP_PATH = "" diff --git a/FlashGBX/res/config.zip b/FlashGBX/res/config.zip index 2818a69..0665202 100644 Binary files a/FlashGBX/res/config.zip and b/FlashGBX/res/config.zip differ