FlashGBX 4.2__py3-none-any.whl → 4.4__py3-none-any.whl

FlashGBX/Mapper.py

@@ -75,8 +75,8 @@ class DMG_MBC:
 			return DMG_Unlicensed_Sachen(args=args, cart_write_fncptr=cart_write_fncptr, cart_read_fncptr=cart_read_fncptr, cart_powercycle_fncptr=cart_powercycle_fncptr, clk_toggle_fncptr=clk_toggle_fncptr)
 		elif mbc_id == 0x205:									# 0x205:'Datel Orbit V2',
 			return DMG_Unlicensed_DatelOrbitV2(args=args, cart_write_fncptr=cart_write_fncptr, cart_read_fncptr=cart_read_fncptr, cart_powercycle_fncptr=cart_powercycle_fncptr, clk_toggle_fncptr=clk_toggle_fncptr)
-		# elif mbc_id == 0x206:									# 0x206:'Datel MegaMem',
-		# 	return DMG_Unlicensed_DatelMegaMem(args=args, cart_write_fncptr=cart_write_fncptr, cart_read_fncptr=cart_read_fncptr, cart_powercycle_fncptr=cart_powercycle_fncptr, clk_toggle_fncptr=clk_toggle_fncptr)
+		elif mbc_id == 0x206:									# 0x206:'MBCX',
+			return DMG_Unlicensed_MBCX(args=args, cart_write_fncptr=cart_write_fncptr, cart_read_fncptr=cart_read_fncptr, cart_powercycle_fncptr=cart_powercycle_fncptr, clk_toggle_fncptr=clk_toggle_fncptr)
 		else:
 			self.__init__(args=args, cart_write_fncptr=cart_write_fncptr, cart_read_fncptr=cart_read_fncptr, cart_powercycle_fncptr=cart_powercycle_fncptr, clk_toggle_fncptr=clk_toggle_fncptr)
 			return self
@@ -269,7 +269,7 @@ class DMG_MBC3(DMG_MBC):
 	
 	def HasRTC(self):
 		dprint("Checking for RTC")
-		if self.MBC_ID not in (0x0F, 0x10, 0x110):
+		if self.MBC_ID not in (0x0F, 0x10, 0x110, 0x206):
 			dprint("No RTC because mapper value is not used for RTC:", self.MBC_ID)
 			return False
 		self.EnableRAM(enable=False)
@@ -831,6 +831,7 @@ class DMG_GMMC1(DMG_MBC5):
 	def CalcChecksum(self, buffer):
 		header = RomFileDMG(buffer[:0x180]).GetHeader()
 		target_chk_value = 0
+		target_sha1_value = 0
 		if header["game_title"] == "NP M-MENU MENU":
 			target_sha1_value = "15f5d445c0b2fdf4221cf2a986a4a5cb8dfda131"
 			target_chk_value = 0x19E8
@@ -1531,6 +1532,44 @@ class DMG_Unlicensed_DatelOrbitV2(DMG_MBC):
 	def GetMaxROMSize(self):
 		return 128*1024
 
+class DMG_Unlicensed_MBCX(DMG_MBC3):
+	def GetName(self):
+		return "MBCX"
+	
+	def HasFlashBanks(self):
+		return True
+
+	def SelectBankFlash(self, index):
+		dprint(self.GetName(), "|SelectBankFlash()|", index)
+
+		commands = [
+			[ 0x0000, 0x05 ],
+			[ 0x4000, 0x82 ],
+			[ 0xA000, index ],
+			[ 0x0000, 0x00 ]
+		]
+		self.CURRENT_FLASH_BANK = index
+		self.CartWrite(commands, delay=0.1)
+
+	def SelectBankROM(self, index):
+		dprint(self.GetName(), index)
+
+		if (index % 512 == 0) or (self.CURRENT_FLASH_BANK != math.floor(index / 512)):
+			self.SelectBankFlash(math.floor(index / 512))
+		self.CURRENT_ROM_BANK = index
+		index = index % 512
+
+		commands = [
+			[ 0x3000, ((index >> 8) & 0xFF) ],
+			[ 0x2100, index & 0xFF ],
+		]
+		
+		self.CartWrite(commands)
+		return (0x4000, self.ROM_BANK_SIZE)
+
+	def GetMaxROMSize(self):
+		return 32*1024*1024
+
 
 class AGB_GPIO:
 	CART_WRITE_FNCPTR = None
@@ -1608,7 +1647,7 @@ class AGB_GPIO:
 			temp = self.CartRead(self.GPIO_REG_DAT) & 0xFF
 			bit = (temp & 2) >> 1
 			data = (data >> 1) | (bit << 7)
-			# print("RTCReadData(): i={:d}/temp={:X}/bit={:x}/data={:x}".format(i, temp, bit, data))
+			# dprint("RTCReadData(): i={:d}/temp={:X}/bit={:x}/data={:x}".format(i, temp, bit, data))
 		return data
 	
 	def RTCWriteData(self, data):
@@ -1664,7 +1703,8 @@ class AGB_GPIO:
 			status = self.RTCReadStatus()
 		else:
 			status = buffer[0]
-		
+
+		dprint("Status:", bin(status))
 		if (status >> 7) == 1:
 			dprint("No RTC because of set RTC Status Register Power Flag:", status >> 7 & 1)
 			return 1
@@ -1684,7 +1724,7 @@ class AGB_GPIO:
 		else:
 			rom2 = buffer[1:7]
 
-		dprint(' '.join(format(x, '02X') for x in rom1), "/", ' '.join(format(x, '02X') for x in rom2))
+		dprint("RTC Data:", ' '.join(format(x, '02X') for x in rom1), "/", ' '.join(format(x, '02X') for x in rom2))
 		if (rom1 == rom2):
 			dprint("No RTC because ROM data didn’t change:", rom1, rom2)
 			return 3
@@ -1869,7 +1909,6 @@ class AGB_GPIO:
 		}
 
 		if rtc_y == 0 and rtc_m == 0 and rtc_d == 0 and rtc_h == 0 and rtc_i == 0 and rtc_s == 0:
-			#raise ValueError("Invalid RTC data")
 			d["string"] = "Invalid RTC data"
 			d["rtc_valid"] = False
 		else:

FlashGBX/PocketCamera.py

@@ -110,7 +110,7 @@ class PocketCamera:
 			offset = 0x2000 + (index * 0x1000)
 		elif index == 30:
 			offset = 0x11FC
-		elif index == 31:
+		else:
 			offset = 0
 		imgbuffer = self.DATA[offset:offset+0x1000]
 		return self.ConvertPicture(imgbuffer)
@@ -138,7 +138,7 @@ class PocketCamera:
 				frame.paste(pic, (left, top))
 				pic = frame
 		
-		pic = pic.resize((pic.width * scale, pic.height * scale), Image.NEAREST)
+		pic = pic.resize((pic.width * scale, pic.height * scale), Image.Resampling.NEAREST)
 
 		ext = os.path.splitext(path)[1]
 		if ext == "" or ext.lower() == ".png":

FlashGBX/PocketCameraWindow.py

@@ -7,6 +7,7 @@ from PIL.ImageQt import ImageQt
 from PIL import Image, ImageDraw
 from .pyside import QtCore, QtWidgets, QtGui, QDesktopWidget
 from .PocketCamera import PocketCamera
+from .UserInputDialog import UserInputDialog
 
 class PocketCameraWindow(QtWidgets.QDialog):
 	CUR_PIC = None
@@ -20,6 +21,7 @@ class PocketCameraWindow(QtWidgets.QDialog):
 	APP_PATH = "."
 	CONFIG_PATH = "."
 	APP = None
+	FORCE_EXIT = False
 	PALETTES = [
 		[ 255, 255, 255,   176, 176, 176,   104, 104, 104,   0, 0, 0 ], # Grayscale
 		[ 208, 217, 60,   120, 164, 106,   84, 88, 84,   36, 70, 36 ], # Game Boy
@@ -33,6 +35,8 @@ class PocketCameraWindow(QtWidgets.QDialog):
 		QtWidgets.QDialog.__init__(self)
 		self.setAcceptDrops(True)
 		if icon is not None: self.setWindowIcon(QtGui.QIcon(icon))
+
+		self.FORCE_EXIT = False
 		self.CUR_FILE = file
 		self.CONFIG_PATH = config_path
 		self.APP_PATH = app_path
@@ -188,7 +192,9 @@ class PocketCameraWindow(QtWidgets.QDialog):
 			self.CUR_PALETTE = len(self.PALETTES) - 1
 		
 		if self.CUR_FILE is not None:
-			self.OpenFile(self.CUR_FILE)
+			if self.OpenFile(self.CUR_FILE) is False:
+				self.FORCE_EXIT = True
+				return
 
 		self.CUR_EXPORT_PATH = self.APP.SETTINGS.value("LastDirPocketCamera")
 		if self.CUR_EXPORT_PATH is None:
@@ -201,6 +207,9 @@ class PocketCameraWindow(QtWidgets.QDialog):
 		self.btnSaveAll.setFocus()
 	
 	def run(self):
+		if self.FORCE_EXIT:
+			self.reject()
+			return
 		self.layout.update()
 		self.layout.activate()
 		screenGeometry = QDesktopWidget().screenGeometry(self)
@@ -217,6 +226,26 @@ class PocketCameraWindow(QtWidgets.QDialog):
 		self.UpdateViewer(self.CUR_INDEX)
 	
 	def OpenFile(self, file):
+		if isinstance(file, bytearray) and len(file) == 0x100000 or isinstance(file, str) and os.path.getsize(file) == 0x100000:
+			dlg_args = {
+				"title":"Photo!",
+				"intro":"A Photo! save file was detected.\n\nPlease select the roll of pictures that you would like to load.",
+				"params": [
+					[ "index", "cmb", "Roll:", [ "Current Save Data" ] + [ "Flash Directory Slot {:d}".format(l) for l in range(1, 8) ], 0 ],
+				]
+			}
+			dlg = UserInputDialog(self, icon=self.windowIcon(), args=dlg_args)
+			if dlg.exec_() == 1:
+				result = dlg.GetResult()
+				index = result["index"].currentIndex()
+				if isinstance(file, str):
+					with open(file, "rb") as f:
+						file = bytearray(f.read())
+				file = file[0x20000 * index:][:0x20000]
+			else:
+				self.CUR_PC = None
+				return False
+
 		try:
 			self.CUR_PC = PocketCamera()
 			if self.CUR_PC.LoadFile(file) == False:
@@ -285,6 +314,7 @@ class PocketCameraWindow(QtWidgets.QDialog):
 		self.SavePicture(self.CUR_INDEX)
 	
 	def btnClose_Clicked(self, event):
+		self.FORCE_EXIT = True
 		self.reject()
 	
 	def hideEvent(self, event):
@@ -309,13 +339,13 @@ class PocketCameraWindow(QtWidgets.QDialog):
 				draw.line([0, 112, 128, 0], fill=(255, 0, 0, 192), width=8)
 				pic.paste(draw_bg, mask=draw_bg)
 				self.lblPhoto[i].setToolTip("This picture was marked as “deleted” and may be overwritten when you take new pictures.")
-			self.CUR_THUMBS[i] = ImageQt(pic.resize((47, 41), Image.HAMMING))
+			self.CUR_THUMBS[i] = ImageQt(pic.resize((47, 41), Image.Resampling.HAMMING))
 			qpixmap = QtGui.QPixmap.fromImage(self.CUR_THUMBS[i])
 			self.lblPhoto[i].setPixmap(qpixmap)
 	
 	def UpdateViewer(self, index):
-		resampler = Image.NEAREST
-		if self.CUR_BICUBIC: resampler = Image.BICUBIC
+		resampler = Image.Resampling.NEAREST
+		if self.CUR_BICUBIC: resampler = Image.Resampling.BICUBIC
 		cam = self.CUR_PC
 		if cam is None: return
 		
@@ -323,7 +353,7 @@ class PocketCameraWindow(QtWidgets.QDialog):
 			self.lblPhoto[i].setStyleSheet("border-top: 1px solid #adadad; border-left: 1px solid #adadad; border-bottom: 1px solid #ffffff; border-right: 1px solid #ffffff;")
 		
 		if index >= 30:
-			self.CUR_PIC = ImageQt(cam.GetPicture(index).convert("RGBA").resize((256, 224), Image.BICUBIC if index == 31 else resampler))
+			self.CUR_PIC = ImageQt(cam.GetPicture(index).convert("RGBA").resize((256, 224), Image.Resampling.BICUBIC if index == 31 else resampler))
 		else:
 			self.CUR_PIC = ImageQt(cam.GetPicture(index).convert("RGBA").resize((256, 224), resampler))
 			self.lblPhoto[index].setStyleSheet("border: 3px solid green; padding: 1px;")

FlashGBX/RomFileAGB.py

@@ -121,6 +121,7 @@ class RomFileAGB:
 	def GetHeader(self, unchanged=False):
 		buffer = bytearray(self.ROMFILE)
 		data = {}
+		if len(buffer) < 0x180: return {}
 		hash = hashlib.sha1(buffer[0:0x180]).digest()
 		nocart_hashes = []
 		nocart_hashes.append(bytearray([ 0x4F, 0xE9, 0x3E, 0xEE, 0xBC, 0x55, 0x93, 0xFE, 0x2E, 0x23, 0x1A, 0x39, 0x86, 0xCE, 0x86, 0xC9, 0x5C, 0x11, 0x00, 0xDD ])) # Method 0
@@ -187,7 +188,9 @@ class RomFileAGB:
 		(data["game_title"] == "CARDE READER" and data["game_code"] == "PSAE" and data["header_checksum"] == 0x95):
 			data["ereader"] = True
 
-		data["unchanged"] = copy.copy(data)
+		if unchanged:
+			data["unchanged"] = copy.copy(data)
+		
 		self.DATA = data
 		data["db"] = self.GetDatabaseEntry()
 

FlashGBX/RomFileDMG.py

@@ -140,8 +140,9 @@ class RomFileDMG:
 		data["rom_checksum_calc"] = self.CalcChecksumGlobal()
 		data["rom_checksum_correct"] = data["rom_checksum"] == data["rom_checksum_calc"]
 		
-		data["unchanged"] = copy.copy(data)
-		if not unchanged:
+		if unchanged:
+			data["unchanged"] = copy.copy(data)
+		else:
 			# MBC2
 			if data["mapper_raw"] == 0x06:
 				data["ram_size_raw"] = 0x100
@@ -431,6 +432,16 @@ class RomFileDMG:
 					temp = self.LogoToImage(buffer[0x104:0x104+0x30])
 					if temp is not False: data["logo_sachen"] = temp
 
+			# GBFlash MBCX
+			if data["game_title"] == "MBCX_MENU":
+				data["rom_size_raw"] = 0x0A
+				data["ram_size_raw"] = 0x03
+				data["mapper_raw"] = 0x206
+
+			# Photo!
+			if data["game_title"] == "PHOTO":
+				data["ram_size_raw"] = 0x204
+
 		if data["mapper_raw"] in Util.DMG_Header_Mapper:
 			data["mapper"] = Util.DMG_Header_Mapper[data["mapper_raw"]]
 		elif data["logo_correct"]:

FlashGBX/Util.py

@@ -2,15 +2,15 @@
 # FlashGBX
 # Author: Lesserkuma (github.com/lesserkuma)
 
-import math, time, datetime, copy, configparser, threading, os, platform, traceback, io, struct, re, statistics, random
+import math, time, datetime, copy, configparser, threading, os, platform, traceback, io, struct, re, statistics, random, sys
 from io import StringIO
 from enum import Enum
 
 # Common constants
 APPNAME = "FlashGBX"
-VERSION_PEP440 = "4.2"
+VERSION_PEP440 = "4.4"
 VERSION = "v{:s}".format(VERSION_PEP440)
-VERSION_TIMESTAMP = 1722797669
+VERSION_TIMESTAMP = 1748007939
 DEBUG = False
 DEBUG_LOG = []
 APP_PATH = ""
@@ -23,14 +23,14 @@ AGB_Header_Save_Sizes = [ 0, 512, 8192, 32768, 65536, 131072, 1048576, 65536, 13
 AGB_Flash_Save_Chips = { 0xBFD4:"SST 39VF512", 0x1F3D:"Atmel AT29LV512", 0xC21C:"Macronix MX29L512", 0x321B:"Panasonic MN63F805MNP", 0xC209:"Macronix MX29L010", 0x6213:"SANYO LE26FV10N1TS", 0xBF5B:"Unlicensed SST49LF080A", 0xFFFF:"Unlicensed 0xFFFF" }
 AGB_Flash_Save_Chips_Sizes = [ 0x10000, 0x10000, 0x10000, 0x10000, 0x20000, 0x20000, 0x20000, 0x20000 ]
 
-DMG_Header_Mapper = { 0x00:'None', 0x01:'MBC1', 0x02:'MBC1+SRAM', 0x03:'MBC1+SRAM+BATTERY', 0x06:'MBC2+SRAM+BATTERY', 0x0F:'MBC3+RTC+BATTERY', 0x10:'MBC3+RTC+SRAM+BATTERY', 0x110:'MBC30+RTC+SRAM+BATTERY', 0x12:'MBC3+SRAM', 0x13:'MBC3+SRAM+BATTERY', 0x19:'MBC5', 0x1A:'MBC5+SRAM', 0x1B:'MBC5+SRAM+BATTERY', 0x1C:'MBC5+RUMBLE', 0x1E:'MBC5+RUMBLE+SRAM+BATTERY', 0x20:'MBC6+SRAM+FLASH+BATTERY', 0x22:'MBC7+ACCELEROMETER+EEPROM', 0x101:'MBC1M', 0x103:'MBC1M+SRAM+BATTERY', 0x0B:'MMM01',  0x0D:'MMM01+SRAM+BATTERY', 0xFC:'MAC-GBD+SRAM+BATTERY', 0x105:'G-MMC1+SRAM+BATTERY', 0x104:'M161', 0xFF:'HuC-1+IR+SRAM+BATTERY', 0xFE:'HuC-3+RTC+SRAM+BATTERY', 0xFD:'TAMA5+RTC+EEPROM', 0x201:'Unlicensed 256M Mapper', 0x202:'Unlicensed Wisdom Tree Mapper', 0x203:'Unlicensed Xploder GB Mapper', 0x204:'Unlicensed Sachen Mapper', 0x205:'Unlicensed Datel Orbit V2 Mapper' }
-DMG_Mapper_Types = { "None":[ 0x00, 0x08, 0x09 ], "MBC1":[ 0x01, 0x02, 0x03 ], "MBC2":[ 0x05, 0x06 ], "MBC3":[ 0x0F, 0x10, 0x11, 0x12, 0x13 ], "MBC30":[ 0x110 ], "MBC5":[ 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E ], "MBC6":[ 0x20 ], "MBC7":[ 0x22 ], "MBC1M":[ 0x101, 0x103 ], "MMM01":[ 0x0B, 0x0D ], "MAC-GBD":[ 0xFC ], "G-MMC1":[ 0x105 ], "M161":[ 0x104 ], "HuC-1":[ 0xFF ], "HuC-3":[ 0xFE ], "TAMA5":[ 0xFD ], "Unlicensed 256M Multi Cart Mapper":[ 0x201 ], "Unlicensed Wisdom Tree Mapper":[ 0x202 ], "Unlicensed Xploder GB Mapper":[ 0x203 ], "Unlicensed Sachen Mapper":[ 0x204 ], "Unlicensed Datel Orbit V2 Mapper":[ 0x205 ] }
-DMG_Header_ROM_Sizes = [ "32 KiB", "64 KiB", "128 KiB", "256 KiB", "512 KiB", "1 MiB", "2 MiB", "4 MiB", "8 MiB", "16 MiB", "32 MiB" ]
-DMG_Header_ROM_Sizes_Map = [ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A ]
-DMG_Header_ROM_Sizes_Flasher_Map = [ 0x8000, 0x10000, 0x20000, 0x40000, 0x80000, 0x100000, 0x200000, 0x400000, 0x800000, 0x1000000, 0x2000000 ]
-DMG_Header_RAM_Sizes = [ "None", "4K SRAM (512 Bytes)", "16K SRAM (2 KiB)", "64K SRAM (8 KiB)", "256K SRAM (32 KiB)", "512K SRAM (64 KiB)", "1M SRAM (128 KiB)", "MBC6 SRAM+FLASH (1.03 MiB)", "MBC7 2K EEPROM (256 Bytes)", "MBC7 4K EEPROM (512 Bytes)", "TAMA5 EEPROM (32 Bytes)", "Unlicensed 4M SRAM (512 KiB)", "Unlicensed 1M EEPROM (128 KiB)" ]
-DMG_Header_RAM_Sizes_Map = [ 0x00, 0x100, 0x01, 0x02, 0x03, 0x05, 0x04, 0x104, 0x101, 0x102, 0x103, 0x201, 0x203, 0x204 ]
-DMG_Header_RAM_Sizes_Flasher_Map = [ 0, 0x200, 0x800, 0x2000, 0x8000, 0x10000, 0x20000, 0x108000, 0x100, 0x200, 0x20, 0x80000, 0x20000, 0x80000 ] # RAM size in bytes
+DMG_Header_Mapper = { 0x00:'None', 0x01:'MBC1', 0x02:'MBC1+SRAM', 0x03:'MBC1+SRAM+BATTERY', 0x06:'MBC2+SRAM+BATTERY', 0x0F:'MBC3+RTC+BATTERY', 0x10:'MBC3+RTC+SRAM+BATTERY', 0x110:'MBC30+RTC+SRAM+BATTERY', 0x12:'MBC3+SRAM', 0x13:'MBC3+SRAM+BATTERY', 0x19:'MBC5', 0x1A:'MBC5+SRAM', 0x1B:'MBC5+SRAM+BATTERY', 0x1C:'MBC5+RUMBLE', 0x1E:'MBC5+RUMBLE+SRAM+BATTERY', 0x20:'MBC6+SRAM+FLASH+BATTERY', 0x22:'MBC7+ACCELEROMETER+EEPROM', 0x101:'MBC1M', 0x103:'MBC1M+SRAM+BATTERY', 0x0B:'MMM01',  0x0D:'MMM01+SRAM+BATTERY', 0xFC:'MAC-GBD+SRAM+BATTERY', 0x105:'G-MMC1+SRAM+BATTERY', 0x104:'M161', 0xFF:'HuC-1+IR+SRAM+BATTERY', 0xFE:'HuC-3+RTC+SRAM+BATTERY', 0xFD:'TAMA5+RTC+EEPROM', 0x201:'Unlicensed 256M Mapper', 0x202:'Unlicensed Wisdom Tree Mapper', 0x203:'Unlicensed Xploder GB Mapper', 0x204:'Unlicensed Sachen Mapper', 0x205:'Unlicensed Datel Orbit V2 Mapper', 0x206:'Unlicensed MBCX Mapper' }
+DMG_Mapper_Types = { "None":[ 0x00, 0x08, 0x09 ], "MBC1":[ 0x01, 0x02, 0x03 ], "MBC2":[ 0x05, 0x06 ], "MBC3":[ 0x0F, 0x10, 0x11, 0x12, 0x13 ], "MBC30":[ 0x110 ], "MBC5":[ 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E ], "MBC6":[ 0x20 ], "MBC7":[ 0x22 ], "MBC1M":[ 0x101, 0x103 ], "MMM01":[ 0x0B, 0x0D ], "MAC-GBD":[ 0xFC ], "G-MMC1":[ 0x105 ], "M161":[ 0x104 ], "HuC-1":[ 0xFF ], "HuC-3":[ 0xFE ], "TAMA5":[ 0xFD ], "Unlicensed 256M Multi Cart Mapper":[ 0x201 ], "Unlicensed Wisdom Tree Mapper":[ 0x202 ], "Unlicensed Xploder GB Mapper":[ 0x203 ], "Unlicensed Sachen Mapper":[ 0x204 ], "Unlicensed Datel Orbit V2 Mapper":[ 0x205 ], "Unlicensed MBCX Mapper":[ 0x206 ] }
+DMG_Header_ROM_Sizes = [ "32 KiB", "64 KiB", "128 KiB", "256 KiB", "512 KiB", "1 MiB", "2 MiB", "4 MiB", "8 MiB", "16 MiB", "32 MiB", "64 MiB", "128 MiB" ]
+DMG_Header_ROM_Sizes_Map = [ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C ]
+DMG_Header_ROM_Sizes_Flasher_Map = [ 0x8000, 0x10000, 0x20000, 0x40000, 0x80000, 0x100000, 0x200000, 0x400000, 0x800000, 0x1000000, 0x2000000, 0x4000000, 0x8000000 ]
+DMG_Header_RAM_Sizes = [ "None", "4K SRAM (512 Bytes)", "16K SRAM (2 KiB)", "64K SRAM (8 KiB)", "256K SRAM (32 KiB)", "512K SRAM (64 KiB)", "1M SRAM (128 KiB)", "MBC6 SRAM+FLASH (1.03 MiB)", "MBC7 2K EEPROM (256 Bytes)", "MBC7 4K EEPROM (512 Bytes)", "TAMA5 EEPROM (32 Bytes)", "Unlicensed 4M SRAM (512 KiB)", "Unlicensed 1M EEPROM (128 KiB)", "Unlicensed Photo! Directory (1 MiB)", "Unlicensed Batteryless SRAM" ]
+DMG_Header_RAM_Sizes_Map = [ 0x00, 0x100, 0x01, 0x02, 0x03, 0x05, 0x04, 0x104, 0x101, 0x102, 0x103, 0x201, 0x203, 0x204, 0x205 ]
+DMG_Header_RAM_Sizes_Flasher_Map = [ 0, 0x200, 0x800, 0x2000, 0x8000, 0x10000, 0x20000, 0x108000, 0x100, 0x200, 0x20, 0x80000, 0x20000, 0x100000, 0x80000 ] # RAM size in bytes
 DMG_Header_SGB = { 0x00:'No support', 0x03:'Supported' }
 DMG_Header_CGB = { 0x00:'No support', 0x80:'Supported', 0xC0:'Required' }
 
@@ -169,6 +169,10 @@ class Progress():
 					self.PROGRESS["time_start"] = args["time_start"]
 				else:
 					self.PROGRESS["time_start"] = now
+				if "abortable" in args:
+					self.PROGRESS["abortable"] = args["abortable"]
+				else:
+					self.PROGRESS["abortable"] = True
 				self.PROGRESS["time_last_emit"] = now
 				self.PROGRESS["time_last_update_speed"] = now
 				self.PROGRESS["time_left"] = 0
@@ -218,7 +222,7 @@ class Progress():
 						self.PROGRESS["sector_pos"] = args["sector_pos"]
 					if "abortable" in args:
 						self.PROGRESS["abortable"] = args["abortable"]
-				
+
 				if ((now - self.PROGRESS["time_last_emit"]) > 0.06) or "force_update" in args and args["force_update"] is True:
 					self.PROGRESS["time_elapsed"] = now - self.PROGRESS["time_start"]
 					time_delta = now - self.PROGRESS["time_last_update_speed"]
@@ -254,6 +258,11 @@ class Progress():
 					self.UPDATER(self.PROGRESS)
 					self.PROGRESS["time_last_emit"] = now
 			
+			elif args["action"] == "UPDATE_INFO":
+				self.PROGRESS["text"] = args["text"]
+				self.PROGRESS["action"] = args["action"]
+				self.UPDATER(self.PROGRESS)
+
 			elif args["action"] == "FINISHED":
 				self.PROGRESS["pos"] = self.PROGRESS["size"]
 				self.UPDATER(self.PROGRESS)
@@ -401,8 +410,14 @@ def EncodeBCD(value):
 def ParseCFI(buffer):
 	buffer = copy.copy(buffer)
 	info = {}
-	magic = "{:s}{:s}{:s}".format(chr(buffer[0x20]), chr(buffer[0x22]), chr(buffer[0x24]))
-	if magic != "QRY": # nothing swapped
+	magic_8bit = "{:s}{:s}{:s}".format(chr(buffer[0x10]), chr(buffer[0x11]), chr(buffer[0x12]))
+	magic_16bit = "{:s}{:s}{:s}".format(chr(buffer[0x20]), chr(buffer[0x22]), chr(buffer[0x24]))
+	buffer_conv = bytearray()
+	if magic_8bit == "QRY":
+		buffer_conv = bytearray(b for x in buffer for b in (x, x))
+		buffer = buffer_conv
+
+	if magic_8bit != "QRY" and magic_16bit != "QRY": # nothing swapped
 		return False
 	
 	try:
@@ -513,7 +528,10 @@ def ConvertMapperTypeToMapper(mapper_type):
 	return 0
 
 def GetDumpReport(di, device):
-	header = di["header"]["unchanged"]
+	header = di["header"]
+	if "unchanged" in di["header"]:
+		header = di["header"]["unchanged"]
+	
 	if "db" in di["header"]: header["db"] = di["header"]["db"]
 	if di["system"] == "DMG":
 		mode = "DMG"
@@ -535,6 +553,8 @@ def GetDumpReport(di, device):
 			di["rom_size"] = "{:s}".format(AGB_Header_ROM_Sizes[AGB_Header_ROM_Sizes_Map.index(di["rom_size"])])
 		else:
 			di["rom_size"] = "{:,} bytes".format(di["rom_size"])
+	else:
+		raise NotImplementedError
 	
 	di["cart_type"] = list(device.SUPPORTED_CARTS[mode].keys())[di["cart_type"]]
 	if di["file_name"] is None:
@@ -795,7 +815,10 @@ def GetDumpReport(di, device):
 			if "st" in db: s += "* Save Type:       {:s}\n".format(AGB_Header_Save_Types[db["st"]])
 			#if "ss" in db: s += "* Save Size:       {:s}\n".format(formatFileSize(size=db["ss"], asInt=True))
 
-	return s
+	if platform.system() == "Windows":
+		return s.replace("\n", "\r\n")
+	else:
+		return s
 
 def GenerateFileName(mode, header, settings=None):
 	fe_ni = True
@@ -911,6 +934,19 @@ def find_size(data, max_size, min_size=0x20):
 			break
 	return offset
 
+def bitmap2pixmap(data, scale_factor=4):
+	try:
+		from .pyside import QtGui
+		from PIL.ImageQt import ImageQt
+		from PIL import Image
+		data_converted = data.convert("RGBA")
+		pixmap = QtGui.QPixmap.fromImage(ImageQt(data_converted.resize((data_converted.width * scale_factor, data_converted.height * scale_factor), Image.NEAREST)))
+		pixmap.setDevicePixelRatio(scale_factor)
+		return pixmap
+	except:
+		print("Couldn’t convert bitmap to pixmap.")
+		return False
+
 def dprint(*args, **kwargs):
 	stack = traceback.extract_stack()
 	stack = stack[len(stack)-2]
@@ -921,3 +957,37 @@ def dprint(*args, **kwargs):
 	if DEBUG:
 		msg = "{:s}{:s}".format(ANSI.CLEAR_LINE, msg)
 		print(msg)
+
+def write_debug_log(device=False):
+	dprint("{:s} version: {:s} ({:d})".format(APPNAME, VERSION_PEP440, VERSION_TIMESTAMP))
+	dprint("Platform: {:s}".format(platform.platform()))
+	if device is not False:
+		if device is not None:
+			dprint("Connected device: {:s}".format(device))
+		else:
+			dprint("No device connected")
+	dprint("Now writing debug log file")
+	try:
+		fn = CONFIG_PATH + "/debug.log"
+		with open(fn, "wb") as f:
+			if platform.system() == "Windows":
+				f.write("\r\n".join(DEBUG_LOG).encode("UTF-8-SIG"))
+			else:
+				f.write("\n".join(DEBUG_LOG).encode("UTF-8-SIG"))
+			print("debug.log written")
+		return True
+	except:
+		return False
+
+def exception_hook(exc_type, exc_value, exc_traceback):
+	if issubclass(exc_type, KeyboardInterrupt):
+		sys.__excepthook__(exc_type, exc_value, exc_traceback)
+		return
+	
+	s = "⚠️ EXCEPTION OCCURED ⚠️\n"
+	lines = traceback.format_exception(exc_type, exc_value, exc_traceback)
+	for line in lines:
+		s += f"{line:s}"
+	print(s)
+	dprint(s)
+	write_debug_log()

FlashGBX/fw_GBFlash.py

@@ -230,11 +230,6 @@ try:
 				self.DEVICE = device
 			else:
 				self.APP.QT_APP.processEvents()
-				text = "This Firmware Updater is for GBFlash devices only. Please only proceed if your device is a GBFlash."
-				msgbox = QtWidgets.QMessageBox(parent=self, icon=QtWidgets.QMessageBox.Warning, windowTitle="FlashGBX", text=text, standardButtons=QtWidgets.QMessageBox.Ok | QtWidgets.QMessageBox.Cancel)
-				msgbox.setDefaultButton(QtWidgets.QMessageBox.Ok)
-				answer = msgbox.exec()
-				if answer == QtWidgets.QMessageBox.Cancel: return
 				self.FWUPD = FirmwareUpdater(app_path, None)
 
 			self.layout = QtWidgets.QGridLayout()

FlashGBX/fw_GBxCartRW_v1_4.py

@@ -110,11 +110,6 @@ try:
 				self.DEVICE = device
 			else:
 				self.APP.QT_APP.processEvents()
-				text = "This Firmware Updater is for insideGadgets GBxCart RW v1.4 devices only. Please only proceed if your device matches this hardware revision.\n\nOlder GBxCart RW revisions can be updated only after connecting to them first."
-				msgbox = QtWidgets.QMessageBox(parent=self, icon=QtWidgets.QMessageBox.Warning, windowTitle="FlashGBX", text=text, standardButtons=QtWidgets.QMessageBox.Ok | QtWidgets.QMessageBox.Cancel)
-				msgbox.setDefaultButton(QtWidgets.QMessageBox.Ok)
-				answer = msgbox.exec()
-				if answer == QtWidgets.QMessageBox.Cancel: return
 				self.FWUPD = FirmwareUpdater(app_path, None)
 
 			self.layout = QtWidgets.QGridLayout()
@@ -217,8 +212,10 @@ try:
 			self.lblDeviceFWVerResult.setText(self.FW_VER)
 			if self.PCB_VER == "v1.4":
 				self.optDevicePCBVer14.setChecked(True)
+				self.optDevicePCBVer14a.setEnabled(False)
 			elif self.PCB_VER == "v1.4a/b/c":
 				self.optDevicePCBVer14a.setChecked(True)
+				self.optDevicePCBVer14.setEnabled(False)
 			self.SetPCBVersion()
 		
 		def SetPCBVersion(self):

FlashGBX/fw_JoeyJr.py

@@ -3,6 +3,7 @@
 # Author: Lesserkuma (github.com/lesserkuma)
 
 import zipfile, time, os, struct, serial, platform
+from serial import SerialException
 try:
 	from . import Util
 except ImportError:
@@ -30,7 +31,9 @@ class FirmwareUpdater():
 		path = os.path.dirname(path) + "/"
 		fncSetStatus(text="Connecting... This may take a moment.")
 		
-		with open(file, "rb") as f: temp = f.read().decode("UTF-8", "ignore")
+		filename = os.path.split(file)[1]
+		filepath = os.path.split(file)[0]
+		with open(filepath + "/" + filename, "rb") as f: temp = f.read().decode("UTF-8", "ignore")
 		if not temp.startswith("UPDATE"):
 			with open(file, "wb") as f:
 				temp = bytearray(b"UPDATE")
@@ -46,10 +49,16 @@ class FirmwareUpdater():
 				return 2
 		
 		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
+			with open(filepath + "/" + filename, "rb") as f: temp = f.read().decode("UTF-8", "ignore")
+		except FileNotFoundError as e:
+			try:
+				if filename == "MODE.TXT":
+					with open(filepath + "/" + "MODE!.TXT", "rb") as f: temp = f.read().decode("UTF-8", "ignore")
+				else:
+					raise FileNotFoundError from e
+			except FileNotFoundError:
+				fncSetStatus(text="Couldn’t access MODE.TXT. Remove cartridge and try again.")
+				return 2
 
 		if not temp.startswith("UPDATE"):
 			fncSetStatus(text="Couldn’t enter UPDATE mode, please try again.")
@@ -112,8 +121,14 @@ class FirmwareUpdater():
 			fncSetStatus(text="Connecting...")
 			try:
 				dev = serial.Serial(port, 2000000, timeout=0.2)
+			except SerialException as e:
+				if "Errno 13" in str(e) and platform.system() == "Linux":
+					fncSetStatus(text="No permission to use device! See README file.", enableUI=True)
+				else:
+					fncSetStatus(text="Device not accessible.", enableUI=True)
+				return 2
 			except:
-				fncSetStatus(text="Device not accessible.", enableUI=True)
+				fncSetStatus(text="Unknown error while accessing the device.", enableUI=True)
 				return 2
 			dev.reset_input_buffer()
 
@@ -272,7 +287,7 @@ try:
 			self.rowUpdate.addStretch()
 
 			self.rowUpdate2 = QtWidgets.QHBoxLayout()
-			self.lblUpdateDisclaimer = QtWidgets.QLabel("Please note that FlashGBX is not officially supported by BennVenn, so please use this firmware updater at your own risk.")
+			self.lblUpdateDisclaimer = QtWidgets.QLabel("Please note that FlashGBX is not officially supported by BennVenn.")
 			self.lblUpdateDisclaimer.setWordWrap(True)
 			self.lblUpdateDisclaimer.setAlignment(QtGui.Qt.AlignmentFlag.AlignCenter)
 			self.rowUpdate2.addWidget(self.lblUpdateDisclaimer)
@@ -467,7 +482,7 @@ try:
 						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 the 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> (or <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:1722774120, 10:1722774120, 11:1722774120, 12:1722774120, 13:1722774120 }
+	DEVICE_LATEST_FW_TS = { 5:1747991884, 10:1747991884, 11:1747991884, 12:1747991884, 13:1747991884 }
 	PCB_VERSIONS = { 5:'', 12:'v1.2', 13:'v1.3' }
 	
 	def __init__(self):
@@ -111,8 +111,10 @@ class GbxDevice(LK_Device):
 				self.FW["cart_power_ctrl"] = True if self._read(1) == 1 else False
 
 				# Reset to bootloader support
-				self.FW["bootloader_reset"] = True if self._read(1) == 1 else False
-
+				temp = self._read(1)
+				self.FW["bootloader_reset"] = True if temp & 1 == 1 else False
+				self.FW["unregistered"] = True if temp >> 7 == 1 else False
+			
 			return True
 		
 		except Exception as e:
@@ -192,10 +194,10 @@ class GbxDevice(LK_Device):
 		return True
 	
 	def FirmwareUpdateAvailable(self):
-		if self.FW["pcb_ver"] == 5: # unofficial firmware
+		if self.FW["pcb_ver"] == 5 or self.FW["fw_ts"] < 1730592000: # unofficial firmware
 			self.FW_UPDATE_REQ = True
 			return True
-		if self.FW["fw_ts"] < self.DEVICE_LATEST_FW_TS[self.FW["pcb_ver"]]:
+		if self.FW["fw_ts"] != self.DEVICE_LATEST_FW_TS[self.FW["pcb_ver"]]:
 			return True
 		self.FW_UPDATE_REQ = False
 		return False
@@ -239,6 +241,13 @@ class GbxDevice(LK_Device):
 
 	def GetFullName(self):
 		if self.FW["pcb_ver"] < 13 and self.CanPowerCycleCart():
-			return "{:s} {:s} + PLUGIN 01".format(self.GetName(), self.GetPCBVersion())
+			s = "{:s} {:s} + PLUGIN 01".format(self.GetName(), self.GetPCBVersion())
 		else:
-			return "{:s} {:s}".format(self.GetName(), self.GetPCBVersion())
+			s = "{:s} {:s}".format(self.GetName(), self.GetPCBVersion())
+		if self.IsUnregistered():
+			s += " (unregistered)"
+		return s
+
+	def GetRegisterInformation(self):
+		text = f"Your GBFlash device reported a registration error, which means it may be an illegitimate clone.\n\nThe device’s integrated piracy detection may limit the device in performance and functionality until proper registration. The {Util.APPNAME:s} software has no control over this.\n\nPlease visit <a href=\"https://gbflash.geeksimon.com/\">https://gbflash.geeksimon.com/</a> for more information.".replace("\n", "<br>")
+		return text