Merge remote-tracking branch 'origin/master' into map/move-hbios-diomed

# Conflicts:
#	Source/HBIOS/hbios.asm

Source/HBIOS/hbios.asm

@@ -105,6 +105,15 @@
 ;
 #DEFINE	HBIOS
 ;
+; IF BUILDING FULL BOOT ROM, INCLUDE INFO MACROS
+;
+#IFDEF ROMBOOT
+  #DEFINE BNKINFO
+  #DEFINE MEMINFO
+  #DEFINE DEVINFO
+  #DEFINE SYSINFO
+#ENDIF
+;
 ; INCLUDE GENERIC STUFF
 ;
 #INCLUDE "std.asm"
@@ -117,12 +126,6 @@ BOOTMODE	.EQU	0
 #IFDEF ROMBOOT
 BOOTMODE	.SET	BM_ROMBOOT
 MODCNT		.SET	MODCNT + 1
-;
-  #DEFINE BNKINFO
-  #DEFINE MEMINFO
-  #DEFINE DEVINFO
-  #DEFINE SYSINFO
-;
 #ENDIF
 ;
 #IFDEF APPBOOT

Source/Images/Common/All/ASCIIART.BAS

@@ -0,0 +1,20 @@
+10 for y=-12 to 12
+20 for x=-39 to 39
+30 ca=x*0.0458
+40 cb=y*0.08333
+50 a=ca
+60 b=cb
+70 for i=0 to 15
+80 t=a*a-b*b+ca
+90 b=2*a*b+cb
+100 a=t
+110 if (a*a+b*b)>4 then goto 200
+120 next i
+130 print " ";
+140 goto 210
+200 if i>9 then i=i+7
+205 print chr$(48+i);
+210 next x
+220 print
+230 next y
+999 system