From 1a791a83ac0c88332417b32271d9ad21294d84c8 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Sat, 16 Feb 2019 18:11:47 -0500
Subject: [PATCH] ootw: intro: add some more text

---
 ootw/Makefile     |  2 +-
 ootw/intro.s      | 47 +++++++++++++++++++++++++++++++++--------------
 ootw/text_print.s | 11 ++++++++++-
 3 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/ootw/Makefile b/ootw/Makefile
index a49e5975..d41af7f3 100644
--- a/ootw/Makefile
+++ b/ootw/Makefile
@@ -54,7 +54,7 @@ INTRO:	intro.o
 intro.o:	intro.s \
 	gr_copy.s gr_fast_clear.s gr_pageflip.s gr_unrle.s gr_putsprite.s \
 	gr_overlay.s \
-	keyboard.s random16.s \
+	keyboard.s random16.s text_print.s \
 	intro_collider_ui.inc \
 	intro_tunnel1.inc intro_tunnel2.inc intro_gone.inc \
 	intro_graphics/01_building/intro_car.inc \
diff --git a/ootw/intro.s b/ootw/intro.s
index eba1e73b..d0d441ef 100644
--- a/ootw/intro.s
+++ b/ootw/intro.s
@@ -780,10 +780,7 @@ uz_loop:
 	lda	#>peanut
 	sta	OUTH
 
-	jsr	move_and_print
-	jsr	move_and_print
-	jsr	move_and_print
-	jsr	move_and_print
+	jsr	move_and_print_list
 
 	jsr	page_flip
 
@@ -800,7 +797,7 @@ peanut_loop:
 	bit	KEYRESET
 
 
-	bit     SET_GR
+
 ;===============================
 ; Particle Accelerator Screen
 ;===============================
@@ -822,6 +819,21 @@ peanut_loop:
 	;
 	;		 P^: 1
 
+
+	lda	#$a0
+	jsr	clear_top_a
+	jsr	clear_bottom
+
+	lda	#<accelerator
+	sta	OUTL
+	lda	#>accelerator
+	sta	OUTH
+
+	jsr	move_and_print_list
+
+	jsr	page_flip
+
+
 	; cursor down, change g+ to g-
 
 	; FLASH: RUN EXPERIMENT ?
@@ -863,7 +875,12 @@ peanut_loop:
 	; 19, 18, 17
 
 
+peanut_loop2:
+	lda	KEYPRESS
+	bpl	peanut_loop2
+	bit	KEYRESET
 
+	bit     SET_GR
 
 ;===============================
 ;===============================
@@ -1582,17 +1599,19 @@ peanut:
 	.byte 0,3,"ALL RIGHTS RESERVED.",0
 	.byte 0,5,"CDOS VERSION 5.01",0
 	.byte 0,18,"> ",0
+	.byte 255
 
 accelerator:
 	.byte 0,0,"MODIFICATION OF PARAMETERS",0
 	.byte 0,1,"RELATING TO PARTICLE",0
 	.byte 0,2,"ACCELERATOR (SYNCHOTRON).",0
-	.byte 15,3,"E: 23%",0
-	.byte 15,4,"G: .005",0
-	.byte 15,5,"RK: 77.2L",0
-	.byte 15,7,"OPT: G+",0
-	.byte 15,9," SHIELD:",0
-	.byte 15,10,"1: OFF",0
-	.byte 15,11,"2: ON",0
-	.byte 15,12,"3: ON",0
-	.byte 15,14," P^: 1",0
+	.byte 15,4,"E: 23%",0
+	.byte 15,5,"G: .005",0
+	.byte 15,6,"RK: 77.2L",0
+	.byte 15,8,"OPT: G+",0
+	.byte 15,10," SHIELD:",0
+	.byte 15,11,"1: OFF",0
+	.byte 15,12,"2: ON",0
+	.byte 15,13,"3: ON",0
+	.byte 15,15,"P^: 1",0
+	.byte 255
diff --git a/ootw/text_print.s b/ootw/text_print.s
index a0a930ad..5245b134 100644
--- a/ootw/text_print.s
+++ b/ootw/text_print.s
@@ -42,7 +42,7 @@ print_string:
 print_string_loop:
 	lda	(OUTL),Y
 	beq	done_print_string
-	ora	#$80
+	eor	#$80			; flip from ASCII to text char
 	sta	(BASL),Y
 	iny
 	bne	print_string_loop
@@ -57,3 +57,12 @@ done_print_string:
 	sta	OUTH
 
 	rts
+
+
+move_and_print_list:
+	jsr	move_and_print
+	ldy	#0
+	lda	(OUTL),Y
+	bpl	move_and_print_list
+
+	rts