Index: trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenu.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenu.asm	(revision 368)
+++ trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenu.asm	(revision 369)
@@ -16,5 +16,4 @@
 ;		All General Purpose Registers
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenu_DisplayAndReturnSelectionInDX:
 	call	DriveXlate_Reset
@@ -39,10 +38,8 @@
 ;		AX, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenu_GetDriveToDXforMenuitemInCX_And_RamVars_GetSegmentToDS:
 	call	RamVars_GetSegmentToDS
 ;;; fall-through
 
-ALIGN JUMP_ALIGN
 BootMenu_GetDriveToDXforMenuitemInCX:
 	cmp		cl, NO_ITEM_HIGHLIGHTED
@@ -73,5 +70,4 @@
 ;		AX, BX, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenu_Enter:
 	mov		bx, BootMenuEvent_Handler
@@ -92,5 +88,4 @@
 ;		CX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenu_GetMenuitemCountToAX:
 	call	RamVars_GetHardDiskCountFromBDAtoAX
@@ -110,5 +105,4 @@
 ;		AL, CX, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenu_GetHeightToAHwithItemCountInAL:
 	add		al, BOOT_MENU_HEIGHT_WITHOUT_ITEMS
@@ -119,5 +113,5 @@
 	jb		SHORT .Return
 	mov		ah, cl
-ALIGN JUMP_ALIGN, ret
+
 .Return:
 	ret
@@ -133,5 +127,4 @@
 ;		CX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenu_GetMenuitemToAXforAsciiHotkeyInAL:
 	call	Char_ALtoUpperCaseLetter
@@ -144,5 +137,5 @@
 	sub		al, 'A'						; Letter to Floppy Drive menuitem
 	ret
-ALIGN JUMP_ALIGN
+
 .StartFromHardDiskLetter:
 	sub		cl, al						; Hard Disk index
@@ -165,5 +158,4 @@
 ;		AX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenu_GetLetterForFirstHardDiskToAL:
 	call	FloppyDrive_GetCountToAX
@@ -172,5 +164,5 @@
 	ja		.Return
 	mov		al, 'C'
-ALIGN JUMP_ALIGN, ret
+		
 .Return:
 	ret
@@ -186,5 +178,4 @@
 ;		AX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenu_GetMenuitemToDXforDriveInDL:
 	xor		dh, dh						; Drive number now in DX
@@ -211,5 +202,4 @@
 ;		AX, CX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenu_IsDriveInSystem:
 	test	dl, dl								; Floppy drive?
Index: trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuEvent.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuEvent.asm	(revision 368)
+++ trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuEvent.asm	(revision 369)
@@ -16,5 +16,4 @@
 ;		All
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenuEvent_Handler:
 
@@ -66,5 +65,4 @@
 ; Returns:
 ;	DS:SI:		Ptr to initialized MENUINIT struct
-ALIGN JUMP_ALIGN
 .FirstEvent:	
 .InitializeMenuinitFromDSSI:
@@ -85,5 +83,4 @@
 	ret
 
-ALIGN JUMP_ALIGN
 .GetDefaultMenuitemToDX:
 	mov		dl, [cs:ROMVARS.bBootDrv]	; Default boot drive
@@ -92,5 +89,5 @@
 	call	DriveXlate_SetDriveToSwap
 	jmp		BootMenu_GetMenuitemToDXforDriveInDL
-ALIGN JUMP_ALIGN
+
 .DoNotSetDefaultMenuitem:
 	xor		dx, dx						; Whatever appears first on boot menu
@@ -101,5 +98,4 @@
 ;	CX:			Index of new highlighted item
 ;	DX:			Index of previously highlighted item or NO_ITEM_HIGHLIGHTED
-ALIGN JUMP_ALIGN
 .ItemHighlightedFromCX:
 	push	cx
@@ -124,5 +120,4 @@
 ;	AL:			ASCII character for the key
 ;	AH:			Keyboard library scan code for the key
-ALIGN JUMP_ALIGN
 .KeyStrokeInAX:
 	cmp		ah, ROM_BOOT_HOTKEY_SCANCODE
@@ -130,5 +125,5 @@
 	;; NOTE: carry flag will be clear after compare above that resulted in zero
 	jmp		Int19hMenu_JumpToBootSector_or_RomBoot   	
-ALIGN JUMP_ALIGN
+
 .CheckDriveHotkeys:
 	call	BootMenu_GetMenuitemToAXforAsciiHotkeyInAL
@@ -147,5 +142,4 @@
 ; Parameters:
 ;	CX:			Index of selected item
-ALIGN JUMP_ALIGN
 .ItemSelectedFromCX:
 	CALL_MENU_LIBRARY Close
Index: trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuInfo.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuInfo.asm	(revision 368)
+++ trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuInfo.asm	(revision 369)
@@ -55,5 +55,4 @@
 ;		CX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenuInfo_GetTotalSectorCount:
 	test	BYTE [di+DPT.bFlagsLow], FLG_DRVNHEAD_LBA
Index: trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuPrint.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuPrint.asm	(revision 368)
+++ trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuPrint.asm	(revision 369)
@@ -15,5 +15,4 @@
 ;		AX, BX, DX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenuPrint_RefreshItem:
 	call	BootMenu_GetDriveToDXforMenuitemInCX_And_RamVars_GetSegmentToDS
@@ -59,5 +58,4 @@
 ;		AX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenuPrint_TitleStrings:
 	mov		si, ROMVARS.szTitle
@@ -76,5 +74,4 @@
 ;		AX, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenuPrint_NullTerminatedStringFromCSSIandSetCF:
 ;
@@ -99,5 +96,4 @@
 ;		AX, BX, CX, DX, SI, DI, ES
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenuPrint_RefreshInformation:
 	CALL_MENU_LIBRARY ClearInformationArea
@@ -188,5 +184,4 @@
 ;		BX, CX, DX, SI, DI, ES
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 .HardDiskRefreshInformation:
 	jc		.HardDiskMenuitemInfoForForeignDrive		; Based on CF from FindDPT_ForDriveNumberInDL (way) above
@@ -229,5 +224,4 @@
 ;		AX, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenuPrint_FormatCSSIfromParamsInSSBP:
 	CALL_DISPLAY_LIBRARY FormatNullTerminatedStringFromCSSI
@@ -246,5 +240,4 @@
 ;		AX, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenuPrint_ClearScreen:
 	call	BootMenuPrint_InitializeDisplayContext
@@ -265,5 +258,4 @@
 ;		AX, BX, CX, DX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenuPrint_TheBottomOfScreen:
 	call	FloppyDrive_GetCountToAX
@@ -351,5 +343,4 @@
 ;		AX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 PushHotkeyParamsAndFormat:
 	push	bp
@@ -378,5 +369,4 @@
 ;		AX, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenuPrint_InitializeDisplayContext:
 	CALL_DISPLAY_LIBRARY InitializeDisplayContext
Index: trunk/XTIDE_Universal_BIOS/Src/Boot/BootPrint.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS/Src/Boot/BootPrint.asm	(revision 368)
+++ trunk/XTIDE_Universal_BIOS/Src/Boot/BootPrint.asm	(revision 369)
@@ -14,5 +14,4 @@
 ;		AX, CX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootPrint_FailedToLoadFirstSector:
 	push	bp
@@ -35,5 +34,4 @@
 ;		AX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootPrint_TryToBootFromDL:
 	push	bp
Index: trunk/XTIDE_Universal_BIOS/Src/Boot/BootSector.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS/Src/Boot/BootSector.asm	(revision 368)
+++ trunk/XTIDE_Universal_BIOS/Src/Boot/BootSector.asm	(revision 369)
@@ -17,5 +17,4 @@
 ;		AX, CX, DH, SI, DI, (DL if failed to read boot sector)
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootSector_TryToLoadFromDriveDL:
 	call	BootPrint_TryToBootFromDL
@@ -52,10 +51,9 @@
 ;		AL, CX, DH, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 LoadFirstSectorFromDriveDL:
 	LOAD_BDA_SEGMENT_TO	es, bx				; ES:BX now points to...
 	mov		bx, BOOTVARS.rgbBootSect		; ...boot sector location
 	mov		di, BOOT_READ_RETRY_TIMES		; Initialize retry counter
-ALIGN JUMP_ALIGN
+
 .ReadRetryLoop:
 	call	.ResetBootDriveFromDL
@@ -78,5 +76,4 @@
 ;		AL
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 .ResetBootDriveFromDL:
 	xor		ax, ax							; AH=0h, Disk Controller Reset
@@ -101,5 +98,4 @@
 ;		AL, CX, DH
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 .LoadFirstSectorFromDLtoESBX:
 	mov		ax, 0201h						; Read 1 sector
Index: trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH0h_HReset.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH0h_HReset.asm	(revision 368)
+++ trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH0h_HReset.asm	(revision 369)
@@ -21,5 +21,4 @@
 ;		CF:		0 if successful, 1 if error
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 AH0h_HandlerForDiskControllerReset:
 	eMOVZX	bx, dl						; Copy requested drive to BL, zero BH to assume no errors
Index: trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH11h_HRecal.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH11h_HRecal.asm	(revision 368)
+++ trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH11h_HRecal.asm	(revision 369)
@@ -17,5 +17,4 @@
 ;		CF:		0 if successful, 1 if error
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 AH11h_HandlerForRecalibrate:
 %ifndef USE_186
Index: trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH15h_HSize.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH15h_HSize.asm	(revision 368)
+++ trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH15h_HSize.asm	(revision 369)
@@ -24,5 +24,4 @@
 ;			CF:		1
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 AH15h_HandlerForReadDiskDriveSize:
 %ifdef MODULE_SERIAL_FLOPPY
Index: trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH23h_HFeatures.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH23h_HFeatures.asm	(revision 368)
+++ trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH23h_HFeatures.asm	(revision 369)
@@ -26,5 +26,4 @@
 ;		CF:		0 if successful, 1 if error
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 AH23h_HandlerForSetControllerFeatures:
 	xchg	si, ax		; SI = Feature Number
@@ -55,5 +54,4 @@
 ;		AL, BX, CX, DX
 ;--------------------------------------------------------------------
-;ALIGN JUMP_ALIGN
 AH23h_SetControllerFeatures:
 	mov		al, COMMAND_SET_FEATURES
Index: trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH25h_HDrvID.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH25h_HDrvID.asm	(revision 368)
+++ trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH25h_HDrvID.asm	(revision 369)
@@ -20,5 +20,4 @@
 ;		CF:		0 if successful, 1 if error
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 AH25h_HandlerForGetDriveInformation:
 	mov		ax, (COMMAND_IDENTIFY_DEVICE << 8 | 1)		; Read 1 sector
Index: trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AHDh_HReset.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AHDh_HReset.asm	(revision 368)
+++ trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AHDh_HReset.asm	(revision 369)
@@ -17,5 +17,4 @@
 ;		CF:		0 if successful, 1 if error
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 AHDh_HandlerForResetHardDisk:
 %ifndef USE_186
Index: trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/EBIOS/AH41h_CheckIfExtensionsPresent.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/EBIOS/AH41h_CheckIfExtensionsPresent.asm	(revision 368)
+++ trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/EBIOS/AH41h_CheckIfExtensionsPresent.asm	(revision 369)
@@ -21,5 +21,4 @@
 ;		CF:		0 if successful, 1 if error
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 AH41h_HandlerForCheckIfExtensionsPresent:
 	cmp		WORD [bp+IDEPACK.intpack+INTPACK.bx], 55AAh
Index: trunk/XTIDE_Universal_BIOS/Src/Initialization/FloppyDrive.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS/Src/Initialization/FloppyDrive.asm	(revision 368)
+++ trunk/XTIDE_Universal_BIOS/Src/Initialization/FloppyDrive.asm	(revision 369)
@@ -109,5 +109,4 @@
 ;		AX, CX, DX, DI, ES
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 FloppyDrive_GetType:
 	mov		ah, 08h			; Get Drive Parameters
@@ -126,5 +125,4 @@
 ;		AX:		Number of Floppy Drives
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 FloppyDrive_GetCountToAX:
 %ifdef MODULE_SERIAL_FLOPPY
@@ -146,5 +144,4 @@
 	ret
 
-ALIGN JUMP_ALIGN
 FloppyDrive_GetCountFromBIOS_or_BDA:
 	push	es
@@ -166,5 +163,4 @@
 ;--------------------------------------------------------------------
 %ifdef USE_AT
-ALIGN JUMP_ALIGN
 .GetCountFromBIOS:
 	push	di
@@ -197,5 +193,4 @@
 ;--------------------------------------------------------------------
 %ifndef USE_AT
-ALIGN JUMP_ALIGN
 .GetCountFromBDA:
 	LOAD_BDA_SEGMENT_TO	es, ax
