FlashGBX 4.0__py3-none-any.whl → 4.1__py3-none-any.whl

FlashGBX/FlashGBX_GUI.py

@@ -183,22 +183,11 @@ class FlashGBX_GUI(QtWidgets.QWidget):
 		self.layout_devices.addWidget(self.cmbDevice)
 		self.layout_devices.addStretch()
 
-		#btnText = "Too&ls"
-		#self.btnTools = QtWidgets.QPushButton(btnText)
-		#btnWidth = self.btnTools.fontMetrics().boundingRect(btnText).width() + 24
-		#if platform.system() == "Darwin": btnWidth += 12
-		#self.btnTools.setMaximumWidth(btnWidth)
 		self.mnuTools = QtWidgets.QMenu("&Tools")
 		self.mnuTools.addAction("Game Boy &Camera Album Viewer", self.ShowPocketCameraWindow)
 		self.mnuTools.addSeparator()
 		self.mnuTools.addAction("Firmware &Updater", self.ShowFirmwareUpdateWindow)
-		#self.btnTools.setMenu(self.mnuTools)
 
-		#btnText = "C&onfig"
-		#self.btnConfig = QtWidgets.QPushButton(btnText)
-		#btnWidth = self.btnConfig.fontMetrics().boundingRect(btnText).width() + 24
-		#if platform.system() == "Darwin": btnWidth += 12
-		#self.btnConfig.setMaximumWidth(btnWidth)
 		self.mnuConfig = QtWidgets.QMenu("&Settings")
 		self.mnuConfig.addAction("Check for &updates on application startup", lambda: [ self.EnableUpdateCheck() ])
 		self.mnuConfig.addAction("&Append date && time to filename of save data backups", lambda: self.SETTINGS.setValue("SaveFileNameAddDateTime", str(self.mnuConfig.actions()[1].isChecked()).lower().replace("true", "enabled").replace("false", "disabled")))
@@ -249,7 +238,6 @@ class FlashGBX_GUI(QtWidgets.QWidget):
 		self.mnuConfig.actions()[7].setChecked(self.SETTINGS.value("UseNoIntroFilenames", default="enabled") == "enabled")
 		self.mnuConfig.actions()[8].setChecked(self.SETTINGS.value("AutoPowerOff", default="350") != "0")
 		self.mnuConfig.actions()[9].setChecked(self.SETTINGS.value("CompareSectors", default="enabled") == "enabled")
-		#self.btnConfig.setMenu(self.mnuConfig)
 
 		self.mnuThirdParty = QtWidgets.QMenu("Third Party &Notices")
 		self.mnuThirdParty.addAction("About &Qt", lambda: [ QtWidgets.QMessageBox.aboutQt(None) ])
@@ -274,8 +262,6 @@ class FlashGBX_GUI(QtWidgets.QWidget):
 		self.btnConnect = QtWidgets.QPushButton("&Connect")
 		self.connect(self.btnConnect, QtCore.SIGNAL("clicked()"), self.ConnectDevice)
 		self.layout_devices.addWidget(self.btnMainMenu)
-		#self.layout_devices.addWidget(self.btnTools)
-		#self.layout_devices.addWidget(self.btnConfig)
 		self.layout_devices.addWidget(self.btnConnect)
 
 		self.layout.addLayout(self.layout_devices, 1, 0, 1, 0)
@@ -355,12 +341,6 @@ class FlashGBX_GUI(QtWidgets.QWidget):
 		lblDMGHeaderRtc.setContentsMargins(0, 1, 0, 1)
 		rowDMGHeaderRtc.addWidget(lblDMGHeaderRtc)
 		self.lblDMGHeaderRtcResult = QtWidgets.QLabel("")
-		#self.lblDMGHeaderRtcResult.setCursor(QtGui.QCursor(QtCore.Qt.WhatsThisCursor))
-		#self.lblDMGHeaderRtcResult.setToolTip("This shows the internal register values; in-game clock may use an offset")
-		#self.lblDMGHeaderRtcResult.setStyleSheet("QLabel {{ color: {:s}; text-decoration: underline; cursor: hand; }}".format(QApplication.palette().color(QtGui.QPalette.Link).name()))
-		#self.lblDMGHeaderRtcResult.setCursor(QtCore.Qt.PointingHandCursor)
-		#self.connect(self.lblDMGHeaderRtcResult, QtCore.SIGNAL("clicked()"), self.EditRTC)
-		#self.lblDMGHeaderRtcResult.clicked.connect(self.EditRTC)
 		self.lblDMGHeaderRtcResult.mousePressEvent = lambda event: [ self.EditRTC(event) ]
 		rowDMGHeaderRtc.addWidget(self.lblDMGHeaderRtcResult)
 		rowDMGHeaderRtc.setStretch(0, 9)
@@ -475,8 +455,6 @@ class FlashGBX_GUI(QtWidgets.QWidget):
 		lblAGBGpioRtc.setContentsMargins(0, 1, 0, 1)
 		rowAGBGpioRtc.addWidget(lblAGBGpioRtc)
 		self.lblAGBGpioRtcResult = QtWidgets.QLabel("")
-		#self.lblAGBGpioRtcResult.setCursor(QtGui.QCursor(QtCore.Qt.WhatsThisCursor))
-		#self.lblAGBGpioRtcResult.setToolTip(self.lblDMGHeaderRtcResult.toolTip())
 		self.lblAGBGpioRtcResult.mousePressEvent = lambda event: [ self.EditRTC(event) ]
 		rowAGBGpioRtc.addWidget(self.lblAGBGpioRtcResult)
 		rowAGBGpioRtc.setStretch(0, 9)
@@ -731,7 +709,7 @@ class FlashGBX_GUI(QtWidgets.QWidget):
 		msg = "This software is being developed by Lesserkuma as a hobby project. There is no affiliation with Nintendo or any other company. This software is provided as-is and the developer is not responsible for any damage that is caused by the use of it. Use at your own risk!<br><br>"
 		msg += f"© 2020–{datetime.datetime.now().year} Lesserkuma<br>"
 		msg += "• Website: <a href=\"https://github.com/lesserkuma/FlashGBX\">https://github.com/lesserkuma/FlashGBX</a><br><br>"
-		msg += "Acknowledgments and Contributors:<br>2358, 90sFlav, AcoVanConis, AdmirtheSableye, AlexiG, ALXCO-Hardware, AndehX, antPL, aronson, Ausar, bbsan, BennVenn, ccs21, chobby, ClassicOldSong, Cliffback, CodyWick13, Corborg, Cristóbal, crizzlycruz, Crystal, Därk, Davidish, DevDavisNunez, Diddy_Kong, djedditt, Dr-InSide, dyf2007, easthighNerd, EchelonPrime, edo999, Eldram, Ell, EmperorOfTigers, endrift, Erba Verde, ethanstrax, eveningmoose, Falknör, FerrantePescara, frarees, Frost Clock, gandalf1980, gboh, gekkio, Godan, Grender, HDR, Herax, Hiccup, hiks, howie0210, iamevn, Icesythe7, ide, Jayro, Jenetrix, JFox, joyrider3774, JS7457, julgr, Kaede, kane159, KOOORAY, kscheel, kyokohunter, Leitplanke, litlemoran, LovelyA72, Lu, Luca DS, LucentW, manuelcm1, marv17, Merkin, metroid-maniac, Mr_V, olDirdey, orangeglo, paarongiroux, Paradoxical, Rairch, Raphaël BOICHOT, redalchemy, RetroGorek, RevZ, RibShark, s1cp, Satumox, Sgt.DoudouMiel, SH, Shinichi999, Sillyhatday, simonK, Sithdown, skite2001, Smelly-Ghost, Stitch, Super Maker, t5b6_de, Tauwasser, TheNFCookie, Timville, twitnic, velipso, Veund, voltagex, Voultar, Warez Waldo, wickawack, Winter1760, Wkr, x7l7j8cc, xactoes, xukkorz, yosoo, Zeii, Zelante, zipplet, Zoo, zvxr"
+		msg += "Acknowledgments and Contributors:<br>2358, 90sFlav, AcoVanConis, AdmirtheSableye, AlexiG, ALXCO-Hardware, AndehX, antPL, aronson, Ausar, bbsan, BennVenn, ccs21, chobby, ClassicOldSong, Cliffback, CodyWick13, Corborg, Cristóbal, crizzlycruz, Crystal, Därk, Davidish, DevDavisNunez, Diddy_Kong, djedditt, Dr-InSide, dyf2007, easthighNerd, EchelonPrime, edo999, Eldram, Ell, EmperorOfTigers, endrift, Erba Verde, ethanstrax, eveningmoose, Falknör, FerrantePescara, frarees, Frost Clock, gandalf1980, gboh, gekkio, Godan, Grender, HDR, Herax, Hiccup, hiks, howie0210, iamevn, Icesythe7, ide, inYourBackline, iyatemu, Jayro, Jenetrix, JFox, joyrider3774, JS7457, julgr, Kaede, kane159, KOOORAY, kscheel, kyokohunter, Leitplanke, litlemoran, LovelyA72, Lu, Luca DS, LucentW, manuelcm1, marv17, Merkin, metroid-maniac, Mr_V, olDirdey, orangeglo, paarongiroux, Paradoxical, Rairch, Raphaël BOICHOT, redalchemy, RetroGorek, RevZ, RibShark, s1cp, Satumox, Sgt.DoudouMiel, SH, Shinichi999, Sillyhatday, simonK, Sithdown, skite2001, Smelly-Ghost, Sonikks, Squiddy, Stitch, Super Maker, t5b6_de, Tauwasser, TheNFCookie, Timville, twitnic, velipso, Veund, voltagex, Voultar, Warez Waldo, wickawack, Winter1760, Wkr, x7l7j8cc, xactoes, xukkorz, yosoo, Zeii, Zelante, zipplet, Zoo, zvxr"
 		QtWidgets.QMessageBox.information(self, "{:s} {:s}".format(APPNAME, VERSION), msg, QtWidgets.QMessageBox.Ok)
 
 	def OpenPath(self, path=None):
@@ -926,7 +904,7 @@ class FlashGBX_GUI(QtWidgets.QWidget):
 		qt_app.processEvents()
 		
 		messages = []
-		last_msg = ""
+		#last_msg = ""
 
 		# pylint: disable=global-variable-not-assigned
 		global hw_devices

FlashGBX/GBMemory.py

@@ -118,24 +118,27 @@ class GBMemoryMap:
 			else:
 				rom_size = 0b101
 
-			if info["rom_header"]["ram_size_raw"] not in Util.DMG_Header_RAM_Sizes_Map:
-				sram_size = 0
-				sram_type = 0b000
+			if mbc_type == 2:
+				sram_type = 0b010
 			else:
-				sram_size = Util.DMG_Header_RAM_Sizes_Flasher_Map[Util.DMG_Header_RAM_Sizes_Map.index(info["rom_header"]["ram_size_raw"])]
-				if sram_size == 0:
+				if info["rom_header"]["ram_size_raw"] not in Util.DMG_Header_RAM_Sizes_Map:
+					sram_size = 0
 					sram_type = 0b000
-				elif sram_size == 0x2000:
-					sram_type = 0b010
-				elif sram_size == 0x8000:
-					sram_type = 0b011
-				elif sram_size == 0x10000:
-					sram_type = 0b100
-				elif sram_size == 0x20000:
-					sram_type = 0b101
 				else:
-					sram_type = 0b000
-			
+					sram_size = Util.DMG_Header_RAM_Sizes_Flasher_Map[Util.DMG_Header_RAM_Sizes_Map.index(info["rom_header"]["ram_size_raw"])]
+					if sram_size == 0:
+						sram_type = 0b000
+					elif sram_size == 0x2000:
+						sram_type = 0b010
+					elif sram_size == 0x8000:
+						sram_type = 0b011
+					elif sram_size == 0x10000:
+						sram_type = 0b100
+					elif sram_size == 0x20000:
+						sram_type = 0b101
+					else:
+						sram_type = 0b000
+				
 			info["map"] = {
 				"mbc_type":mbc_type,
 				"rom_size":rom_size,
@@ -236,23 +239,26 @@ class GBMemoryMap:
 				else:
 					rom_size = 0b101
 
-				if info["rom_header"]["game_title"] == "NP M-MENU MENU" or info["rom_header"]["ram_size_raw"] not in Util.DMG_Header_RAM_Sizes_Map:
-					sram_size = 0
-					sram_type = 0b000
+				if mbc_type == 2:
+					sram_type = 0b010
 				else:
-					sram_size = Util.DMG_Header_RAM_Sizes_Flasher_Map[Util.DMG_Header_RAM_Sizes_Map.index(info["rom_header"]["ram_size_raw"])]
-					if sram_size == 0:
+					if info["rom_header"]["game_title"] == "NP M-MENU MENU" or info["rom_header"]["ram_size_raw"] not in Util.DMG_Header_RAM_Sizes_Map:
+						sram_size = 0
 						sram_type = 0b000
-					elif sram_size == 0x2000:
-						sram_type = 0b010
-					elif sram_size == 0x8000:
-						sram_type = 0b011
-					elif sram_size == 0x10000:
-						sram_type = 0b100
-					elif sram_size == 0x20000:
-						sram_type = 0b101
 					else:
-						sram_type = 0b000
+						sram_size = Util.DMG_Header_RAM_Sizes_Flasher_Map[Util.DMG_Header_RAM_Sizes_Map.index(info["rom_header"]["ram_size_raw"])]
+						if sram_size == 0:
+							sram_type = 0b000
+						elif sram_size == 0x2000:
+							sram_type = 0b010
+						elif sram_size == 0x8000:
+							sram_type = 0b011
+						elif sram_size == 0x10000:
+							sram_type = 0b100
+						elif sram_size == 0x20000:
+							sram_type = 0b101
+						else:
+							sram_type = 0b000
 
 				info["map"] = {
 					"mbc_type":mbc_type,

FlashGBX/LK_Device.py

@@ -420,14 +420,16 @@ class LK_Device(ABC):
 			retries -= 1
 			dprint("Retries left:", retries)
 			
-			hp = 10
+			hp = 20
 			temp = 0
 			while temp not in (1, 2) and hp > 0:
+				self.DEVICE.reset_output_buffer()
+				self.DEVICE.reset_input_buffer()
 				self.DEVICE.write(b'\x00')
 				temp = self._read(1)
-				dprint("Current response:", temp)
 				hp -= 1
-			if hp == 0: break
+				dprint("Current response:", temp, ", HP:", hp)
+			#if hp == 0: break
 		return False
 	
 	def _write(self, data, wait=False):
@@ -532,8 +534,11 @@ class LK_Device(ABC):
 		buffer.extend(struct.pack(">I", key))
 		buffer.extend(struct.pack(">I", value))
 
-		self._try_write(buffer)
-	
+		if self.FW["fw_ver"] >= 12:
+			return self._try_write(buffer)
+		else:
+			return self._write(buffer)
+		
 	def _cart_read(self, address, length=0, agb_save_flash=False):
 		if self.MODE == "DMG":
 			if length == 0:
@@ -595,7 +600,10 @@ class LK_Device(ABC):
 			buffer.extend(struct.pack(">I", address >> 1))
 			buffer.extend(struct.pack(">H", value & 0xFFFF))
 		
-		self._try_write(buffer)
+		if self.FW["fw_ver"] >= 12:
+			self._try_write(buffer)
+		else:
+			self._write(buffer)
 		
 		if self.MODE == "DMG" and sram: self._set_fw_variable("DMG_WRITE_CS_PULSE", 0)
 	
@@ -864,7 +872,8 @@ class LK_Device(ABC):
 			self.SIGNAL = None
 	
 	def Debug(self):
-		# self.SetPin(["PIN_AUDIO"], True)
+		# for i in range(0, 0x100000):
+		# 	print(hex(i), self._set_fw_variable("ADDRESS", i), end="\r", flush=True)
 		return
 
 	def ReadInfo(self, setPinsAsInputs=False, checkRtc=True):
@@ -2174,22 +2183,26 @@ class LK_Device(ABC):
 
 						if ".dev" in Util.VERSION_PEP440 or Util.DEBUG:
 							with open("debug_cfi.bin", "wb") as f: f.write(cfi_buffer)
-						magic = "{:s}{:s}{:s}".format(chr(cfi_buffer[0x20]), chr(cfi_buffer[0x22]), chr(cfi_buffer[0x24]))
-						d_swap = (0, 0)
-						if magic == "QRY": # D0D1 not swapped
-							pass
-						elif magic == "RQZ": # D0D1 swapped
-							d_swap = [(0, 1)]
-							for j2 in range(0, len(d_swap)):
-								for j in range(0, len(cfi_buffer)):
-									cfi_buffer[j] = bitswap(cfi_buffer[j], d_swap[j2])
-						elif magic == "\x92\x91\x9A": # D0D1+D6D7 swapped
-							d_swap = [( 0, 1 ), ( 6, 7 )]
-							for j2 in range(0, len(d_swap)):
-								for j in range(0, len(cfi_buffer)):
-									cfi_buffer[j] = bitswap(cfi_buffer[j], d_swap[j2])
-							with open("debug_cfi_2.bin", "wb") as f: f.write(cfi_buffer)
-						else:
+						try:
+							magic = "{:s}{:s}{:s}".format(chr(cfi_buffer[0x20]), chr(cfi_buffer[0x22]), chr(cfi_buffer[0x24]))
+							d_swap = (0, 0)
+							if magic == "QRY": # D0D1 not swapped
+								pass
+							elif magic == "RQZ": # D0D1 swapped
+								d_swap = [(0, 1)]
+								for j2 in range(0, len(d_swap)):
+									for j in range(0, len(cfi_buffer)):
+										cfi_buffer[j] = bitswap(cfi_buffer[j], d_swap[j2])
+							elif magic == "\x92\x91\x9A": # D0D1+D6D7 swapped
+								d_swap = [( 0, 1 ), ( 6, 7 )]
+								for j2 in range(0, len(d_swap)):
+									for j in range(0, len(cfi_buffer)):
+										cfi_buffer[j] = bitswap(cfi_buffer[j], d_swap[j2])
+								if ".dev" in Util.VERSION_PEP440 or Util.DEBUG:
+									with open("debug_cfi_d0d1+d6d7.bin", "wb") as f: f.write(cfi_buffer)
+							else:
+								cfi_buffer = None
+						except:
 							cfi_buffer = None
 
 						if self.MODE == "DMG":
@@ -2523,6 +2536,7 @@ class LK_Device(ABC):
 
 				self.INFO["dump_info"]["vf_addr_reorder"] = addr_reorder
 				self.INFO["dump_info"]["vf_value_reorder"] = value_reorder
+				self.INFO["dump_info"]["agb_read_method"] = self.AGB_READ_METHODS[self.AGB_READ_METHOD]
 
 			else:
 				self.INFO["dump_info"]["agb_read_method"] = self.AGB_READ_METHODS[self.AGB_READ_METHOD]
@@ -3326,6 +3340,8 @@ class LK_Device(ABC):
 						rtc_buffer = self._read(8)
 						if len(rtc_buffer) == 8 and _agb_gpio.HasRTC(rtc_buffer) is True:
 							rtc_buffer = rtc_buffer[1:]
+							rtc_buffer.append(_agb_gpio.RTCReadStatus()) # 24h mode = 0x40, reset flag = 0x80
+							rtc_buffer.extend(struct.pack("<Q", int(time.time())))
 						else:
 							rtc_buffer = None
 					else:
@@ -3540,6 +3556,9 @@ class LK_Device(ABC):
 		if (self.FW["fw_ver"] < 12 and "set_irq_high" in cart_type and cart_type["set_irq_high"] is True):
 			self.SetProgress({"action":"ABORT", "info_type":"msgbox_critical", "info_msg":"This cartridge type requires at least firmware version L12.", "abortable":False})
 			return False
+		if (self.FW["fw_ver"] < 12 and "status_register_mask" in cart_type and cart_type["status_register_mask"] is True):
+			self.SetProgress({"action":"ABORT", "info_type":"msgbox_critical", "info_msg":"This cartridge type requires at least firmware version L12.", "abortable":False})
+			return False
 		# Firmware check L12
 
 		# Ensure cart is powered
@@ -4100,7 +4119,7 @@ class LK_Device(ABC):
 							len_rest = end_address - pos
 							skip_se = False
 							ts_se_start = time.time()
-							if "compare_sectors" in args and args["compare_sectors"] is True and sector[1] <= len_rest and not (flashcart and cart_type["command_set"] == "GBAMP"):
+							if self.FW["fw_ver"] >= 12 and "compare_sectors" in args and args["compare_sectors"] is True and sector[1] <= len_rest and not (flashcart and cart_type["command_set"] == "GBAMP"):
 								verified = self.CompareCRC32(buffer=data_import, offset=sector[0], length=sector[1], address=start_address, flashcart=flashcart, reset=True)
 								if verified is True:
 									skip_se = True
@@ -4380,7 +4399,7 @@ class LK_Device(ABC):
 						dprint(f"Verifying ROM bank #{bank} at 0x{pos_from:x} (physical 0x{start_address:X}, 0x{verify_len:X} bytes)")
 						
 						verified = False
-						if sector[1] >= verify_len and crc32_errors < 5:
+						if self.FW["fw_ver"] >= 12 and sector[1] >= verify_len and crc32_errors < 5:
 							verified = self.CompareCRC32(buffer=data_import, offset=pos_from, length=verify_len, address=start_address, flashcart=flashcart, reset=False)
 							if verified is True:
 								dprint("CRC32 verification successful between 0x{:X} and 0x{:X}".format(pos_from, verify_len))

FlashGBX/Mapper.py

@@ -404,8 +404,6 @@ class DMG_MBC3(DMG_MBC):
 						seconds = dt_new.second
 						minutes = dt_new.minute
 						hours = dt_new.hour
-						#temp = dt_new - dt_buffer1
-						#days = temp.days
 						temp = datetime.date.fromtimestamp(timestamp_now) - datetime.date.fromtimestamp(timestamp_then)
 						days = temp.days + days
 						if days >= 512:
@@ -413,13 +411,6 @@ class DMG_MBC3(DMG_MBC):
 							days = days % 512
 						dprint(seconds, minutes, hours, days, carry)
 
-				#buffer[0x00] = seconds % 60
-				#buffer[0x04] = minutes % 60
-				#buffer[0x08] = hours % 24
-				#buffer[0x0C] = days & 0xFF
-				#buffer[0x10] = days >> 8 & 0x1
-				#if carry:
-				#	buffer[0x10] |= 0x80
 			except Exception as e:
 				print("Couldn’t update the RTC register values\n", e)
 		
@@ -1065,15 +1056,10 @@ class DMG_HuC3(DMG_MBC):
 						dprint(dt_then, dt_now, dt_buffer1, dt_buffer2, dt_new, sep="\n")
 						minutes = dt_new.minute
 						hours = dt_new.hour
-						#temp = dt_new - dt_buffer1
-						#days = temp.days
 						temp = datetime.date.fromtimestamp(timestamp_now) - datetime.date.fromtimestamp(timestamp_then)
 						days = temp.days + days
 						dprint(minutes, hours, days)
 				
-				#total_minutes = 60 * hours + minutes
-				#data = (total_minutes & 0xFFF) | ((days & 0xFFF) << 12)
-				#buffer[0:4] = struct.pack("<I", data)
 				d = {
 					"rtc_h":hours,
 					"rtc_m":minutes,
@@ -1322,23 +1308,8 @@ class DMG_TAMA5(DMG_MBC):
 						dt_new_notime = dt_new.replace(hour=0, minute=0, second=0)
 						days_passed = int((dt_new_notime.timestamp() - dt_buffer_notime.timestamp()) / 60 / 60 / 24)
 						weekday += days_passed % 7
-						#print("leap_year_state#1", leap_year_state)
 						leap_year_state = (leap_year_state + year_new) % 4
-						#print("leap_year_state#2", leap_year_state)
-						#print("New:", seconds, minutes, hours, day_of_week, days, months, years, leap_year_state, z24h_flag)
-
-				# buffer[0x00] = Util.EncodeBCD(seconds)
-				# buffer[0x01] = Util.EncodeBCD(minutes)
-				# buffer[0x02] = Util.EncodeBCD(hours)
-				# buffer[0x03] = (weekday & 0xF) | ((Util.EncodeBCD(days) & 0xF) << 4)
-				# buffer[0x04] = (Util.EncodeBCD(days) >> 4) | ((Util.EncodeBCD(months) & 0xF) << 4)
-				# buffer[0x05] = (Util.EncodeBCD(months) >> 4) | ((Util.EncodeBCD(years) & 0xF) << 4)
-				# buffer[0x06] = (Util.EncodeBCD(years) >> 4)
-				# buffer[0x0D] = leap_year_state << 4 | z24h_flag
-				
-				#dstr = ' '.join(format(x, '02X') for x in buffer)
-				#print("[{:02X}] {:s}".format(int(len(dstr)/3) + 1, dstr))
-			
+
 			except Exception as e:
 				print("Couldn’t update the RTC register values\n", e)
 
@@ -1560,31 +1531,6 @@ class DMG_Unlicensed_DatelOrbitV2(DMG_MBC):
 	def GetMaxROMSize(self):
 		return 128*1024
 
-# class DMG_Unlicensed_DatelMegaMem(DMG_MBC):
-# 	def GetName(self):
-# 		return "Datel MegaMem"
-	
-# 	def __init__(self, args=None, cart_write_fncptr=None, cart_read_fncptr=None, cart_powercycle_fncptr=None, clk_toggle_fncptr=None):
-# 		if args is None: args = {}
-# 		super().__init__(args=args, cart_write_fncptr=cart_write_fncptr, cart_read_fncptr=cart_read_fncptr, cart_powercycle_fncptr=cart_powercycle_fncptr, clk_toggle_fncptr=None)
-# 		self.ROM_BANK_SIZE = 0x4000
-# 		self.RAM_BANK_SIZE = 0x4000
-
-# 	def SelectBankROM(self, index):
-# 		dprint(self.GetName(), "|", index)
-# 		return (0, self.ROM_BANK_SIZE)
-
-# 	def SelectBankRAM(self, index):
-# 		dprint(self.GetName(), "|", index)
-# 		self.CartWrite([[ 0x2000, index & 0x20 ]])
-# 		return (0x4000, self.RAM_BANK_SIZE)
-
-# 	def GetROMBanks(self, rom_size):
-# 		return 1
-	
-# 	def GetMaxROMSize(self):
-# 		return 16*1024
-
 
 class AGB_GPIO:
 	CART_WRITE_FNCPTR = None
@@ -1769,9 +1715,8 @@ class AGB_GPIO:
 			])
 		
 		# Add timestamp of backup time
-		ts = int(time.time())
 		buffer.append(self.RTCReadStatus()) # 24h mode = 0x40, reset flag = 0x80
-		buffer.extend(struct.pack("<Q", ts))
+		buffer.extend(struct.pack("<Q", int(time.time())))
 
 		dprint(' '.join(format(x, '02X') for x in buffer))
 		

FlashGBX/Util.py

@@ -8,9 +8,9 @@ from enum import Enum
 
 # Common constants
 APPNAME = "FlashGBX"
-VERSION_PEP440 = "4.0"
+VERSION_PEP440 = "4.1"
 VERSION = "v{:s}".format(VERSION_PEP440)
-VERSION_TIMESTAMP = 1719702722
+VERSION_TIMESTAMP = 1722759922
 DEBUG = False
 DEBUG_LOG = []
 APP_PATH = ""
@@ -410,7 +410,7 @@ def ParseCFI(buffer):
 		info["magic"] = "{:s}{:s}{:s}".format(chr(buffer[0x20]), chr(buffer[0x22]), chr(buffer[0x24]))
 		
 		if buffer[0x36] == 0xFF and buffer[0x48] == 0xFF:
-			print("FAIL: No information about the voltage range found in CFI data.")
+			print("Note: Invalid values found in Common Flash Interface data.")
 			try:
 				with open("./cfi_debug.bin", "wb") as f: f.write(buffer)
 			except:

FlashGBX/fw_JoeyJr.py

@@ -32,31 +32,39 @@ class FirmwareUpdater():
 		
 		with open(file, "rb") as f: temp = f.read().decode("UTF-8", "ignore")
 		if not temp.startswith("UPDATE"):
-			with open(file, "w", encoding="UTF-8") as f: f.write("UPDATE\r\n")
+			with open(file, "wb") as f:
+				temp = bytearray(b"UPDATE")
+				temp += bytearray([0] * (256 - len(temp)))
+				f.write(temp)
 			hp = 30
 			while hp > 0:
 				if os.path.exists(path + "FIRMWARE.JR"): break
 				time.sleep(1)
 				hp -= 1
 			if hp == 0:
-				fncSetStatus(text="Error: Couldn’t communicate with the Joey Jr device.")
+				fncSetStatus(text="Couldn’t communicate with the Joey Jr device.")
 				return 2
 		
-		with open(file, "rb") as f: temp = f.read().decode("UTF-8", "ignore")
+		try:
+			with open(file, "rb") as f: temp = f.read().decode("UTF-8", "ignore")
+		except FileNotFoundError:
+			fncSetStatus(text="Couldn’t access MODE.TXT. Remove cartridge and try again.")
+			return 2
+
 		if not temp.startswith("UPDATE"):
-			fncSetStatus(text="Error: Couldn’t enter UPDATE mode, please try again.")
+			fncSetStatus(text="Couldn’t enter UPDATE mode, please try again.")
 			return 2
 
 		fncSetStatus(text="Updating firmware... Do not unplug the device!", setProgress=0)
 		os.unlink(path + "FIRMWARE.JR")
 		if os.path.exists(path + "FIRMWARE.JR"):
-			fncSetStatus(text="Error: Couldn’t write new firmware, please try again.")
+			fncSetStatus(text="Couldn’t write new firmware, please try again.")
 			return 2
 
 		try:
 			f = open(path + "FIRMWARE.JR", "wb")
 		except OSError:
-			fncSetStatus(text="Error: Couldn’t write new firmware, please try again.")
+			fncSetStatus(text="Couldn’t write new firmware, please try again.")
 			return 2
 		
 		for i in range(0, len(buffer), 64):
@@ -69,9 +77,18 @@ class FirmwareUpdater():
 		except OSError:
 			pass
 
-		time.sleep(3)
+		if b"Joey Jr. Firmware" not in buffer:
+			hp = 5
+			while hp > 0:
+				if not os.path.exists(path + "FIRMWARE.JR"): break
+				time.sleep(1)
+				hp -= 1
+			if hp == 0:
+				fncSetStatus(text="Couldn’t verify, please try again.")
+				return 2
+
 		fncSetStatus("Done.")
-		time.sleep(1)
+		time.sleep(2)
 
 		return True
 	
@@ -141,16 +158,16 @@ class FirmwareUpdater():
 				pass
 			elif counter + 64 < size:
 				print("\nBad response at", counter)
-				fncSetStatus(text="Error: Bad response at 0x{:X}!".format(counter), setProgress=percent)
+				fncSetStatus(text="Error! Bad response at 0x{:X}!".format(counter), setProgress=percent)
 				return 2
 			
 			counter += 64
 			fncSetStatus(text="Updating firmware... Do not unplug the device!", setProgress=percent)
 
 		dev.close()
-		time.sleep(0.8)
-		fncSetStatus("Done.", setProgress=100)
 		time.sleep(1)
+		fncSetStatus("Done.", setProgress=100)
+		time.sleep(2)
 		return 1
 
 try:
@@ -302,9 +319,9 @@ try:
 			self.lblDeviceNameResult.setText(self.DEV_NAME + " " + self.PCB_VER)
 			self.lblDeviceFWVerResult.setText(self.FW_VER)
 
-			if platform.system() == 'Darwin':
-				self.optFW_MSC.setVisible(False)
-				self.lblFW_MSC_Blerb.setVisible(False)
+			# if platform.system() == 'Darwin':
+			# 	self.optFW_MSC.setVisible(False)
+			# 	self.lblFW_MSC_Blerb.setVisible(False)
 		
 		def run(self):
 			try:
@@ -446,8 +463,11 @@ try:
 				elif ret == 4:
 					if platform.system() == 'Darwin':
 						self.SetStatus("No device found.", enableUI=True)
+						text = "If your Joey Jr device is currently running the Drag'n'Drop firmware, please update the firmware on Windows or Linux, or use the standalone firmware updater."
+						msgbox = QtWidgets.QMessageBox(parent=self, icon=QtWidgets.QMessageBox.Critical, windowTitle="FlashGBX", text=text, standardButtons=QtWidgets.QMessageBox.Ok)
+						answer = msgbox.exec()
 						return False
-					answer = QtWidgets.QMessageBox.information(self, "FlashGBX", "If your Joey Jr device is currently running a Drag'n'Drop firmware, please continue and choose its <b>MODE.TXT</b> file.", QtWidgets.QMessageBox.Ok | QtWidgets.QMessageBox.Cancel, QtWidgets.QMessageBox.Ok)
+					answer = QtWidgets.QMessageBox.information(self, "FlashGBX", "If your Joey Jr device is currently running the Drag'n'Drop firmware, please continue and choose its <b>MODE.TXT</b> file.", QtWidgets.QMessageBox.Ok | QtWidgets.QMessageBox.Cancel, QtWidgets.QMessageBox.Ok)
 					if answer == QtWidgets.QMessageBox.Cancel:
 						self.SetStatus("No device found.", enableUI=True)
 						return False

FlashGBX/hw_GBFlash.py

@@ -9,7 +9,7 @@ class GbxDevice(LK_Device):
 	DEVICE_NAME = "GBFlash"
 	DEVICE_MIN_FW = 1
 	DEVICE_MAX_FW = 12
-	DEVICE_LATEST_FW_TS = { 5:1719609931, 10:1719609931, 11:1719609931, 12:1719609931, 13:1719609931 }
+	DEVICE_LATEST_FW_TS = { 5:1722759904, 10:1722759904, 11:1722759904, 12:1722759904, 13:1722759904 }
 	PCB_VERSIONS = { 5:'', 12:'v1.2', 13:'v1.3' }
 	
 	def __init__(self):

FlashGBX/hw_GBxCartRW.py

@@ -9,7 +9,7 @@ class GbxDevice(LK_Device):
 	DEVICE_NAME = "GBxCart RW"
 	DEVICE_MIN_FW = 1
 	DEVICE_MAX_FW = 1
-	DEVICE_LATEST_FW_TS = { 4:1709317610, 5:1719609931, 6:1719609931, 2:0, 90:0, 100:0 }
+	DEVICE_LATEST_FW_TS = { 4:1709317610, 5:1722759904, 6:1722759904, 2:0, 90:0, 100:0 }
 	PCB_VERSIONS = { 5:'v1.4', 6:'v1.4a/b/c', 2:'v1.1/v1.2', 4:'v1.3', 90:'XMAS v1.0', 100:'Mini v1.0' }
 	BAUDRATE = 1000000
 	MAX_BUFFER_READ = 0x1000
@@ -191,7 +191,7 @@ class GbxDevice(LK_Device):
 			if self.FW["fw_ver"] >= 12:
 				temp = bytearray([self.DEVICE_CMD["QUERY_CART_PWR"]])
 				self._get_fw_variable("CART_MODE")
-			else:
+			elif self.CanPowerCycleCart():
 				temp = bytearray([self.DEVICE_CMD["OFW_QUERY_CART_PWR"]])
 				self._write(temp)
 				self._read(1)
@@ -320,3 +320,8 @@ class GbxDevice(LK_Device):
 		except SerialException:
 			pass
 		return super().Close(cartPowerOff)
+
+	def SetTimeout(self, seconds=1):
+		if seconds < 1: seconds = 1
+		self.DEVICE_TIMEOUT = seconds
+		self.DEVICE.timeout = self.DEVICE_TIMEOUT

FlashGBX/hw_JoeyJr.py

@@ -9,7 +9,7 @@ class GbxDevice(LK_Device):
 	DEVICE_NAME = "Joey Jr"
 	DEVICE_MIN_FW = 1
 	DEVICE_MAX_FW = 12
-	DEVICE_LATEST_FW_TS = 1719609931
+	DEVICE_LATEST_FW_TS = 1722759904
 	PCB_VERSIONS = { -1:"", 0x01:"V2", 0x81:"V2", 0x02:"V2C", 0x82:"V2C", 0x03:"V2CC", 0x83:"V2CC/V2++" }
 	
 	def __init__(self):

{FlashGBX-4.0.dist-info → FlashGBX-4.1.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: FlashGBX
-Version: 4.0
-Summary: Reads and writes Game Boy and Game Boy Advance cartridge data using the GBxCart RW by insideGadgets
+Version: 4.1
+Summary: Reads and writes Game Boy and Game Boy Advance cartridge data
 Home-page: https://github.com/lesserkuma/FlashGBX
 Author: Lesserkuma
 Project-URL: Source, https://github.com/lesserkuma/FlashGBX/
@@ -73,7 +73,8 @@ These work for installing fresh and upgrading from an older version.
 * If installation fails, try this command instead:<br>`pip3 install "FlashGBX[qt5]"`
 * If installation still fails, you can install the minimal version (command line interface) with this command:<br>`pip3 install FlashGBX`
 
-* Pre-made Linux packages and instructions for select distributions are available [here](https://github.com/JJ-Fox/FlashGBX-Linux-builds/releases/latest).
+* Pre-made Linux packages and instructions for select distributions are available [here](https://github.com/JJ-Fox/FlashGBX-Linux-builds/releases/latest), contributed by JJ-Fox.
+* Pre-made macOS packages and instructions are available [here](https://github.com/Cliffback/FlashGBX-macOS) (in the “Releases” section), contributed by Cliffback.
 
 #### Running
 Use this command in a Terminal or Command Prompt window to launch the installed FlashGBX application:
@@ -146,7 +147,7 @@ Use this command in a Terminal or Command Prompt window to launch the installed
   - DIY cart with MX29F040
   - DIY cart with MX29LV640
   - DIY cart with SST39SF040
-  - DMG-MBC5-32M-FLASH Development Cartridge, E201264
+  - DMG-MBC5-32M-FLASH (G/A) Development Cartridge, E201264
   - Ferrante Crafts cart 32 KB
   - Ferrante Crafts cart 64 KB
   - Ferrante Crafts cart 512 KB
@@ -174,8 +175,9 @@ Use this command in a Terminal or Command Prompt window to launch the installed
 - Game Boy Advance
 
   - Action Replay Ultimate Codes (with SST39VF800A)
-  - Development AGB Cartridge 64M Flash, E201629
-  - Development AGB Cartridge 64M Flash S, E201843
+  - Development AGB Cartridge 64M Flash, E201629¹
+  - Development AGB Cartridge 64M Flash, E201629 (128M, with 4× LH28F320BJE)¹
+  - Development AGB Cartridge 64M Flash S, E201843¹
   - Development AGB Cartridge 128M Flash S, E201850
   - Development AGB Cartridge 256M Flash S, E201868
   - DL9SEC GBA flashcart with TE28F128
@@ -325,7 +327,7 @@ Use this command in a Terminal or Command Prompt window to launch the installed
   - GA-07 with unlabeled flash chip
   - GE28F128W30 with 128W30B0
   - K5L2BX_32D_16D_V2 with K5L2833ATA
-  - M36XXX_32A_EARTH with M36L0R8060B
+  - M36XXX_32A_EARTH with M36L0R806
   - M36XXX_T32_32D_16D with M36L0R806
   - M5M29-39VF512 with M5M29HD528
   - M5M29G130AN (no PCB text)
@@ -369,7 +371,7 @@ Many different reproduction cartridges share their flash chip command set, so ev
 
 The author would like to thank the following very kind people for their help, contributions or documentation (in alphabetical order):
 
-2358, 90sFlav, AcoVanConis, AdmirtheSableye, AlexiG, ALXCO-Hardware, AndehX, antPL, aronson, Ausar, bbsan, BennVenn, ccs21, chobby, ClassicOldSong, Cliffback, CodyWick13, Corborg, Cristóbal, crizzlycruz, Crystal, Därk, Davidish, DevDavisNunez, Diddy_Kong, djedditt, Dr-InSide, dyf2007, easthighNerd, EchelonPrime, edo999, Eldram, Ell, EmperorOfTigers, endrift, Erba Verde, ethanstrax, eveningmoose, Falknör, FerrantePescara, frarees, Frost Clock, gandalf1980, gboh, gekkio, Godan, Grender, HDR, Herax, Hiccup, hiks, howie0210, iamevn, Icesythe7, ide, Jayro, Jenetrix, JFox, joyrider3774, JS7457, julgr, Kaede, kane159, KOOORAY, kscheel, kyokohunter, Leitplanke, litlemoran, LovelyA72, Lu, Luca DS, LucentW, manuelcm1, marv17, Merkin, metroid-maniac, Mr_V, olDirdey, orangeglo, paarongiroux, Paradoxical, Rairch, Raphaël BOICHOT, redalchemy, RetroGorek, RevZ, RibShark, s1cp, Satumox, Sgt.DoudouMiel, SH, Shinichi999, Sillyhatday, simonK, Sithdown, skite2001, Smelly-Ghost, Stitch, Super Maker, t5b6_de, Tauwasser, TheNFCookie, Timville, twitnic, velipso, Veund, voltagex, Voultar, Warez Waldo, wickawack, Winter1760, Wkr, x7l7j8cc, xactoes, xukkorz, yosoo, Zeii, Zelante, zipplet, Zoo, zvxr
+2358, 90sFlav, AcoVanConis, AdmirtheSableye, AlexiG, ALXCO-Hardware, AndehX, antPL, aronson, Ausar, bbsan, BennVenn, ccs21, chobby, ClassicOldSong, Cliffback, CodyWick13, Corborg, Cristóbal, crizzlycruz, Crystal, Därk, Davidish, DevDavisNunez, Diddy_Kong, djedditt, Dr-InSide, dyf2007, easthighNerd, EchelonPrime, edo999, Eldram, Ell, EmperorOfTigers, endrift, Erba Verde, ethanstrax, eveningmoose, Falknör, FerrantePescara, frarees, Frost Clock, gandalf1980, gboh, gekkio, Godan, Grender, HDR, Herax, Hiccup, hiks, howie0210, iamevn, Icesythe7, ide, inYourBackline, iyatemu, Jayro, Jenetrix, JFox, joyrider3774, JS7457, julgr, Kaede, kane159, KOOORAY, kscheel, kyokohunter, Leitplanke, litlemoran, LovelyA72, Lu, Luca DS, LucentW, manuelcm1, marv17, Merkin, metroid-maniac, Mr_V, olDirdey, orangeglo, paarongiroux, Paradoxical, Rairch, Raphaël BOICHOT, redalchemy, RetroGorek, RevZ, RibShark, s1cp, Satumox, Sgt.DoudouMiel, SH, Shinichi999, Sillyhatday, simonK, Sithdown, skite2001, Smelly-Ghost, Sonikks, Squiddy, Stitch, Super Maker, t5b6_de, Tauwasser, TheNFCookie, Timville, twitnic, velipso, Veund, voltagex, Voultar, Warez Waldo, wickawack, Winter1760, Wkr, x7l7j8cc, xactoes, xukkorz, yosoo, Zeii, Zelante, zipplet, Zoo, zvxr
 
 ## Third Party Notices and Licenses
 

{FlashGBX-4.0.dist-info → FlashGBX-4.1.dist-info}/RECORD

@@ -1,43 +1,43 @@
 FlashGBX/DataTransfer.py,sha256=9o3BSBed-SMIWkl-TcmolUjBdrGwem8TqjnktWScgBA,1766
 FlashGBX/FlashGBX.py,sha256=QbLvnqN5K9JLOYhQX6xvrC-H5fl9bYhWDzkOgo8pdUo,12736
 FlashGBX/FlashGBX_CLI.py,sha256=eJ4DJP6u-HDn8hZjsReHTRckme0c_T718NzKzEgF6eQ,64741
-FlashGBX/FlashGBX_GUI.py,sha256=NYxcXMPPYG3_gxZCBLaz2HXwMD6NqzC8-ormQIwlkbE,172302
+FlashGBX/FlashGBX_GUI.py,sha256=2Ww-5XEzp828MTXmpBa5VLXdvM6QMDrWDZ_anC8jBAk,170901
 FlashGBX/Flashcart.py,sha256=S-af7YjsIOCx3sYsS4GjrHt80HD4-RrdLd0EBipXZ-Q,36396
-FlashGBX/GBMemory.py,sha256=J5LIHRnhcUw-w_QM2S-m2kFtSZrPZNW-FFffuxhqBGQ,13172
-FlashGBX/LK_Device.py,sha256=wZWpYk-1-0QbdqppjtASPxU1XEHI55hCWyq5tfTc0x8,187138
-FlashGBX/Mapper.py,sha256=RNU1yeiQX-ee-CtBeHzGWxprT-5ubfm_Ies_MC7ILQ4,59199
+FlashGBX/GBMemory.py,sha256=c1AMjW-TCtKfyexFLCS0pUA7dNmWyUXqUikN_QUf0MU,13320
+FlashGBX/LK_Device.py,sha256=odZ-N_2WwUR_oUnkRhPindNiXMzhkbnote53VLCmNKg,188187
+FlashGBX/Mapper.py,sha256=eLw3xwxb43SLGbSmjXfzjPHK2w87NWbVsHt53Ac7F64,56964
 FlashGBX/PocketCamera.py,sha256=uTkhpvlKfDy7fQRLoHTIxTXh-WdvYj2OUeNo45KhLoY,4899
 FlashGBX/PocketCameraWindow.py,sha256=sqWv94gUeFBmUa8Zn1u-Zb4-qVcw5j-Q_tE7hz3sYpc,16185
 FlashGBX/RomFileAGB.py,sha256=ad9WBGnPbW6a2y7B5R3rwizhocPFANMAwKCXJYBPQdA,8908
 FlashGBX/RomFileDMG.py,sha256=gm9_m41Jv70mLxQzrol3acCoCpOoivllrVtizrSuWss,21466
 FlashGBX/UserInputDialog.py,sha256=aYe3CeYlzQoCLI4DQulL5K9euB0HcMpcKZCFZfIJzqE,2911
-FlashGBX/Util.py,sha256=VplrfX0N2jGQqASEOmUNCki3CiOc1QrvqP_6iRx9m2I,40137
+FlashGBX/Util.py,sha256=5kUj2aV9g_AzWRBeQEgw10Hz9PCO3zFKb3Y9h11DueI,40132
 FlashGBX/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 FlashGBX/__main__.py,sha256=L3ibKoTXOlTCepGzrgcktk_Jwp25xBCmGpNQO7W8Bbc,120
 FlashGBX/fw_GBFlash.py,sha256=ebRADjLw_2eOckLYCoUlepRpLD_eTtLTXOxCJ4zskKM,15629
 FlashGBX/fw_GBxCartRW_v1_3.py,sha256=qiYReJi1C-UDTjJVY0VujIsM5wPolnUrl_3TQYV-Drw,21498
 FlashGBX/fw_GBxCartRW_v1_4.py,sha256=K6eWc6_hy5WZUhCHHxTbigUvvWa3csjnomPEj7TMocM,14733
-FlashGBX/fw_JoeyJr.py,sha256=btdHZZlrR7ZfYIgDBULTwdZWvyEeuqii-a1VisoVY1E,19906
-FlashGBX/hw_GBFlash.py,sha256=XW7Cw3_keNf3JKaisBFHeCGktrozjwqHN-r9xUoBE4U,7668
-FlashGBX/hw_GBxCartRW.py,sha256=GBsxaJwELPbOI4Ds8u9o9ncDBKgHE1VfYTCtRYSJ_Rs,10803
-FlashGBX/hw_JoeyJr.py,sha256=uYFuX5-Rqxqc03SnlRB-V66-ROGO3BzxlrYXO9mlThc,9334
+FlashGBX/fw_JoeyJr.py,sha256=YJP68_gE2djJ3dPjnQVenEk91LtFUAyy1WHK6bwXwSg,20689
+FlashGBX/hw_GBFlash.py,sha256=mhJZY92KRXKkq295a8yui5aXfVq1oTTzhi_YnsAN9iY,7668
+FlashGBX/hw_GBxCartRW.py,sha256=kKwIF7iq2OkHU-j6360GCla-MA8UEeUmlX0UchMmXfI,10974
+FlashGBX/hw_JoeyJr.py,sha256=X-057WiQbC_Kony0wq1JZ1qUyphphmigdq8imOaxX6Y,9334
 FlashGBX/pyside.py,sha256=hlvYbV29AFJ1Epv0R41Sz-wuo4I9-gH8hgS8sfwJyCk,1662
 FlashGBX/res/Third Party Notices.md,sha256=X-1MRGTAQB8ZuskoWvbhq4IBYj-G0jJoklya3jGwzcQ,18994
-FlashGBX/res/config.zip,sha256=PLkNTEpbuIXQS2yNQpnYY-WhbLhSsWLTEqQPKmChAGU,378626
-FlashGBX/res/fw_GBFlash.zip,sha256=3_pXtbDjhudiNdKDMtrzwzQQnHLxdYuixT313pLPW70,17482
+FlashGBX/res/config.zip,sha256=_uLA9ZZZr93228IG0nCqdX4fVsYwBkCbhpoaoQQuRXA,379195
+FlashGBX/res/fw_GBFlash.zip,sha256=yLhQT18oNyFgErCWtN9N6B1Kzybe1ijeWP64mWXXVac,17482
 FlashGBX/res/fw_GBxCart_RW_Mini_v1_0.zip,sha256=-QpHSw2JsjPG2WQ7E6mRqre4D3VThau2U7bFZYPY6r0,4774
 FlashGBX/res/fw_GBxCart_RW_XMAS_v1_0.zip,sha256=ai6ithbSsEst22lCcDyJhr8KIlixqhg3HF4XV16Fdto,8093
 FlashGBX/res/fw_GBxCart_RW_v1_1_v1_2.zip,sha256=H9tTjRMovpRkR89tUCsMMpwPslCoRml_cEWu8oYfMLs,8137
 FlashGBX/res/fw_GBxCart_RW_v1_3.zip,sha256=zi2f7fdulQcSATuiIFMaCrpz3mCF5RGftVpbZNVedq0,15681
-FlashGBX/res/fw_GBxCart_RW_v1_4.zip,sha256=6sjr6XG9-oLqCIpmQWY7_xAGMpAOzDKbxmb6MHMU6Jw,36772
-FlashGBX/res/fw_GBxCart_RW_v1_4a.zip,sha256=Ay_8RSqYGiw0DBjDhm1c_FKXLjKttz3hxKkKRy0_9i4,36260
-FlashGBX/res/fw_JoeyJr.zip,sha256=E-8mZH2nr_dz0d5pB0DSzyTnIt8HeZ1-zoTo7GBP35s,68206
+FlashGBX/res/fw_GBxCart_RW_v1_4.zip,sha256=mqapwg_dKu3AOCvLQjfWafIqNe5Vt78Vw-pM75TWFeE,36772
+FlashGBX/res/fw_GBxCart_RW_v1_4a.zip,sha256=63U8MWewmnD22e9kGqTxATUmzxbz0tkAoQXmAXU2yps,36260
+FlashGBX/res/fw_JoeyJr.zip,sha256=G73Rp_6FaoZ4DIMQ3MSQGauglXaXUgXS7pyE90m8iEA,68964
 FlashGBX/res/icon.ico,sha256=2FNNCkh2W0IFQNYNdy8cmodh69NC0gYfpw81GZtr9rU,129959
 FlashGBX/res/icon.png,sha256=WtE7XqPKr2538lw4gVbm6slWvMLJpwYjre8_z1q70GY,19286
 FlashGBX/res/pc_frame.png,sha256=Hp8cUT_e7kc3-nrTD9ekB8gNVgKNEZRr75ggNDihJOg,653
-FlashGBX-4.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-FlashGBX-4.0.dist-info/METADATA,sha256=Lg2DaoHU76Xb2blqMKZ-6FUODEY__LQtyh4PECnpuHQ,18976
-FlashGBX-4.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-FlashGBX-4.0.dist-info/entry_points.txt,sha256=lsg7RmPUIvEI_Q8bA3jIRh8MLF1qIBzUX_yEjD4lJ-g,52
-FlashGBX-4.0.dist-info/top_level.txt,sha256=y6Ssb3YnEYYHNJIPsG_b5ifITM1STAyQXMpjtNOtyzA,9
-FlashGBX-4.0.dist-info/RECORD,,
+FlashGBX-4.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+FlashGBX-4.1.dist-info/METADATA,sha256=wgbdITgl9-GZ9lq-vWICaHuik0f6L8ijariVFz5CUkg,19262
+FlashGBX-4.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+FlashGBX-4.1.dist-info/entry_points.txt,sha256=lsg7RmPUIvEI_Q8bA3jIRh8MLF1qIBzUX_yEjD4lJ-g,52
+FlashGBX-4.1.dist-info/top_level.txt,sha256=y6Ssb3YnEYYHNJIPsG_b5ifITM1STAyQXMpjtNOtyzA,9
+FlashGBX-4.1.dist-info/RECORD,,