Index: trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Dialogs.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Dialogs.asm	(revision 601)
+++ trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Dialogs.asm	(revision 602)
@@ -21,4 +21,29 @@
 SECTION .text
 
+
+;--------------------------------------------------------------------
+; Dialogs_DisplayNotificationFromCSDX
+; Dialogs_DisplayErrorFromCSDX
+;	Parameters:
+;		CS:DX:	Ptr to notification/error string to display
+;		SS:BP:	Menu handle
+;	Returns:
+;		Nothing
+;	Corrupts registers:
+;		AX
+;--------------------------------------------------------------------
+ALIGN JUMP_ALIGN
+Dialogs_DisplayNotificationFromCSDX:
+	push	di
+	mov		di, g_szNotificationDialog
+	jmp		SHORT DisplayMessageDialogWithMessageInCSDXandDialogInputInDSSI
+
+ALIGN JUMP_ALIGN
+Dialogs_DisplayErrorFromCSDX:
+	push	di
+	mov		di, g_szErrorDialog
+	SKIP1B	al
+	; Fall to DisplayMessageDialogWithMessageInCSDXandDialogInputInDSSI
+
 ;--------------------------------------------------------------------
 ; Dialogs_DisplayHelpFromCSDXwithTitleInCSDI
@@ -32,52 +57,16 @@
 ;		AX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 Dialogs_DisplayHelpFromCSDXwithTitleInCSDI:
+	push	di
+
+DisplayMessageDialogWithMessageInCSDXandDialogInputInDSSI:
 	push	ds
 	push	si
-	push	di
 	push	cx
 
-	mov		cx, DIALOG_INPUT_size
-	call	Memory_ReserveCXbytesFromStackToDSSI
+	mov		cl, DIALOG_INPUT_size
+	call	Memory_ReserveCLbytesFromStackToDSSI
+	call	InitializeDialogInputFromDSSI
 	mov		[si+DIALOG_INPUT.fszTitle], di
-	jmp		SHORT DisplayMessageDialogWithMessageInCSDXandDialogInputInDSSI
-
-;--------------------------------------------------------------------
-; Dialogs_DisplayNotificationFromCSDX
-; Dialogs_DisplayErrorFromCSDX
-;	Parameters:
-;		CS:DX:	Ptr to notification string to display
-;		SS:BP:	Menu handle
-;	Returns:
-;		Nothing
-;	Corrupts registers:
-;		AX
-;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
-Dialogs_DisplayNotificationFromCSDX:
-	push	ds
-	push	si
-	push	di
-	push	cx
-
-	mov		cx, DIALOG_INPUT_size
-	call	Memory_ReserveCXbytesFromStackToDSSI
-	mov		WORD [si+DIALOG_INPUT.fszTitle], g_szNotificationDialog
-	jmp		SHORT DisplayMessageDialogWithMessageInCSDXandDialogInputInDSSI
-
-ALIGN JUMP_ALIGN
-Dialogs_DisplayErrorFromCSDX:
-	push	ds
-	push	si
-	push	di
-	push	cx
-
-	mov		cx, DIALOG_INPUT_size
-	call	Memory_ReserveCXbytesFromStackToDSSI
-	mov		WORD [si+DIALOG_INPUT.fszTitle], g_szErrorDialog
-ALIGN JUMP_ALIGN
-DisplayMessageDialogWithMessageInCSDXandDialogInputInDSSI:
-	call	InitializeDialogInputFromDSSI
 	mov		[si+DIALOG_INPUT.fszItems], dx
 	CALL_MENU_LIBRARY DisplayMessageWithInputInDSSI
@@ -85,7 +74,8 @@
 	add		sp, BYTE DIALOG_INPUT_size
 	pop		cx
-	pop		di
 	pop		si
 	pop		ds
+
+	pop		di
 	ret
 
@@ -135,6 +125,6 @@
 	push	ds
 
-	mov		cx, DIALOG_INPUT_size
-	call	Memory_ReserveCXbytesFromStackToDSSI
+	mov		cl, DIALOG_INPUT_size
+	call	Memory_ReserveCLbytesFromStackToDSSI
 	call	InitializeDialogInputFromDSSI
 	mov		[si+DIALOG_INPUT.fszTitle], bx
Index: trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menuitem.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menuitem.asm	(revision 601)
+++ trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menuitem.asm	(revision 602)
@@ -50,6 +50,6 @@
 	call	Registers_CopyDSSItoESDI
 
-	mov		cx, DIALOG_INPUT_size
-	call	Memory_ReserveCXbytesFromStackToDSSI
+	mov		cl, DIALOG_INPUT_size
+	call	Memory_ReserveCLbytesFromStackToDSSI
 	call	InitializeDialogInputInDSSIfromMenuitemInESDI
 	mov		ax, [es:di+MENUITEM.itemValue+ITEM_VALUE.szMultichoice]
@@ -87,6 +87,6 @@
 
 	call	Registers_CopyDSSItoESDI
-	mov		cx, WORD_DIALOG_IO_size
-	call	Memory_ReserveCXbytesFromStackToDSSI
+	mov		cl, WORD_DIALOG_IO_size
+	call	Memory_ReserveCLbytesFromStackToDSSI
 	call	InitializeDialogInputInDSSIfromMenuitemInESDI
 	mov		[si+WORD_DIALOG_IO.bNumericBase], bl
Index: trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/FlashMenu.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/FlashMenu.asm	(revision 601)
+++ trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/FlashMenu.asm	(revision 602)
@@ -221,6 +221,6 @@
 
 	call	.PrepareBuffersForFlashing
-	mov		cx, FLASHVARS_size + PROGRESS_DIALOG_IO_size
-	call	Memory_ReserveCXbytesFromStackToDSSI
+	mov		cl, FLASHVARS_size + PROGRESS_DIALOG_IO_size
+	call	Memory_ReserveCLbytesFromStackToDSSI
 	call	.InitializeFlashvarsFromDSSI
 	mov		bx, si							; DS:BX now points to FLASHVARS
Index: trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/MainMenu.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/MainMenu.asm	(revision 601)
+++ trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/MainMenu.asm	(revision 602)
@@ -249,6 +249,6 @@
 LoadBiosFromFile:
 	call	Buffers_SaveChangesIfFileLoaded
-	mov		cx, FILE_DIALOG_IO_size
-	call	Memory_ReserveCXbytesFromStackToDSSI
+	mov		cl, FILE_DIALOG_IO_size
+	call	Memory_ReserveCLbytesFromStackToDSSI
 	call	Dialogs_DisplayFileDialogWithDialogIoInDSSI
 	cmp		BYTE [si+FILE_DIALOG_IO.bUserCancellation], TRUE
Index: trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Strings.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Strings.asm	(revision 601)
+++ trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Strings.asm	(revision 602)
@@ -293,5 +293,5 @@
 g_szValueCfgDevice8b:						db	"8-bit",NULL
 g_szValueCfgDeviceRev1:						db	"XTIDE r1",NULL
-g_szValueCfgDeviceRev2:						db	"XTIDE r2",NULL
+g_szValueCfgDeviceRev2:
 g_szValueCfgDeviceRev2Olivetti:				db	"XTIDE r2",NULL
 g_szValueCfgDeviceXTCFPio8:					db	"XTCF PIO",NULL
