ootw: more work on real Apple II+

games/ootw/qboot/qboot_stage2.s

@@ -17,7 +17,8 @@ WAIT    = $FCA8                 ;; delay 1/2(26+27A+5A^2) us
 
 code_begin:
 
-	.byte	version
+	.byte	version		; note this also gets over-written as a
+				; side-effect of the patching code
 
 readnib:
 slotpatch1:			; smc

games/ootw/qboot/qload.s

@@ -11,32 +11,19 @@ qload_start:
 	; first time entry
 	; start by loading text title
 
-	jsr	title
+	jsr	title			; display title / get which to load
 
-;	lda	#LOAD_TEXT_TITLE	; load title
-;	sta	WHICH_LOAD
+	; get the current disk we're on
 
 	lda	$8A5			; from boot sector
 	sta	CURRENT_DISK		; current disk number
 
-;	jsr	load_file
-
-;	jsr	$800
-
-;	lda	#LOAD_TITLE		; load title
-;	sta	WHICH_LOAD
 
 main_game_loop:
 	jsr	load_file
 
-;	lda	WHICH_LOAD
-;	bne	not_title
+	; always enter at $1800
 
-;start_title:
-;	jsr	$4000
-;	jmp	main_game_loop
-
-;not_title:
 	jsr	$1800
 	jmp	main_game_loop
 
@@ -63,7 +50,7 @@ load_file_no_diskcheck:
 	lda	length_array,X
 	sta	load_length
 
-	jsr	load_new
+	jsr	load_new		; FIXME: tail call
 
 	rts
 

games/ootw/qboot/title.s

@@ -7,6 +7,8 @@ title:
 	lda	#0
 	sta	MENU_BASE		; start at level0 by default
 	sta	MENU_HIGHLIGHT
+	sta	DISP_PAGE
+	sta	DRAW_PAGE		; need to be 0 or weird issues
 
 redraw_title:
 	bit	TEXT