Graphics initialization

.gitignore

@@ -2,6 +2,9 @@
 *~
 *.swp
 
+# Build process output
+as65-output.txt
+
 # Prerequisites
 *.d
 

src/macros.s

@@ -70,3 +70,12 @@ PUTF     .MACRO
 	PUTS	(\0)       ;PRINT STRING
 	.ENDM
 
+; Overwrites A and Y
+HLIN	.MACRO	x1,x2,y
+	ldy	x1			;Leftmost X coordinate
+	lda	x2
+	sta	H2			;Rightmost X coordinate
+	lda	y			;Y coordinate
+	jsr	HLINE
+	.ENDM
+

src/rnd.s

@@ -9,23 +9,28 @@
 	.include    "symbols.s"
 	.include    "macros.s"
 
-main	jsr	seedRandomNumGenerator
+main
+	jsr	seedRandomNumGenerator
+	jsr	initLoResFullScreen
 	jsr	setRandomColor		;Set the color
 	jsr	drawHallway
 	jsr	drawRoom
+	jsr	waitForKeypress
+	sta	TEXTON
 	rts
 
 drawHallway
 	lda	#16
 	jsr	generateRandomInt
+	sta	x2			;Rightmost X coordinate
+	HLIN	#0,x2,#10
 	rts
 
-setupGraphics
-	jsr	activateLoResPage1
-	lda	#10
-	ldy	#10
-	jsr	PLOT
-	jsr	activateTextPage1
+initLoResFullScreen
+	sta	TEXTOFF			;Enable graphics
+	sta	HIRESOFF		;Enable Lo-res
+	sta	MIXEDOFF		;Full screen
+	jsr	CLRSCR			;Clear the screen
 	rts
 
 ; Add A to FAC leaving result in FAC
@@ -85,6 +90,6 @@ generateRandomPositive
 setRandomColor
 	lda	#15			;Max color number
 	jsr	generateRandomPositive
-	jsr	SETCOL			;Set the color
+	jsr	SETCOLR			;Set the color
 	rts
 

src/symbols.s

@@ -7,6 +7,19 @@
 ;                              *
 ;*******************************
 
+;*******************************
+;                              *
+; LORES ZERO PAGE ADDRESSES    *
+;                              *
+;*******************************
+
+GBASL	 .EQU	$26
+GRASH 	 .EQU	$27
+H2 	 .EQU	$2C
+V2 	 .EQU	$20
+MASK 	 .EQU	$2E
+COLOR 	 .EQU	$30
+
 RNDL	 .EQU	$4e	;Continuously incremented while waiting for keyboard input
 RNDH	 .EQU	$4f	;High byte of RNDL
 FACEXP	 .EQU	$9d	;Address of FAC exponent used by FADDT,FSUBT,FMULTT,FDIVT
@@ -22,8 +35,7 @@ KBD .EQU $C000 ;BIT 7 IS 1 IF KEY PRESSED
 KBDSTRB	 .EQU	$C010	;CLEARS KBD BIT 7
 CLR80STO .EQU	$C000	;ALLOW PAGE2 PG1 & PG2 SWITCHING
 SET80STO .EQU	$C001	;ALLOW PAGE2 MAIN & AUX SWITCHNG
-STO80 .EQU $C018 ;1=PAGE2 SWITCHES MAIN/AUX
-   ;0=PAGE2 SWITCHES VIDEO PAGES
+STO80    .EQU	$C018	;1=PAGE2 SWITCHES MAIN/AUX ;0=PAGE2 SWITCHES VIDEO PAGES
 CLR80VID .EQU	$C00C	;TURN OFF 80-COL DISPLAY
 SET80VID .EQU	$C00D	;TURN ON 80-COL DISPLAY
 COL80	 .EQU	$C01F	;0=40 COL IS ON, 1=80 COL IS ON
@@ -83,12 +95,12 @@ RND .EQU $EFAE ;APPLESOFT RND FUNCTION
 ;*******************************
 
 PLOT	 .EQU	$F800	;PLOT LO-RES BLOCK IN CURRENT COLOR A=VERT, Y=HORZ
-HLINE .EQU $F819 ;HORIZONTAL LINE
+HLINE	 .EQU	$F819	;Horizontal line: A=Ycoord, Y=LEFTX, H2=RightX
 VLINE	 .EQU	$F828	;VERTICAL LINE
 CLRSCR	 .EQU	$F832	;CLEAR LOW-RES SCREEN
 CLRTOP	 .EQU	$F836	;CLEAR THE TOP OF LOW-RES
 NEXTCOL	 .EQU	$F85F	;INCREMENT COLOR BY 3
-SETCOL .EQU $F864 ;SET LOW-RES GRAPHICS COLOR
+SETCOLR	 .EQU	$F864	;SET LOW-RES GRAPHICS COLOR
 SCRN	 .EQU	$F871	;READ THE LOW-RES SCREEN
 TEXTCMD	 .EQU	$FB2F
 TEXTMODE .EQU	$FB39