From 9ce02b18747747f2c68f5fe80da1444bb76e6467 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Tue, 17 Nov 2020 19:20:30 -0500
Subject: [PATCH] botdemo: back to showing all

---
 appleiibot/circles.bas             |   4 ++--
 bot_demo/CIRCLES.BAS               | Bin 252 -> 252 bytes
 bot_demo/botdemo.s                 |   2 +-
 bot_demo/timeline.inc              |  28 +++++++++++++---------------
 hellmood_memories/circles_normal.s |  18 ++++++++++--------
 5 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/appleiibot/circles.bas b/appleiibot/circles.bas
index 39f7806a..325b01e2 100644
--- a/appleiibot/circles.bas
+++ b/appleiibot/circles.bas
@@ -1,2 +1,2 @@
-2 GR:FOR X=0TO100:A=(PEEK(2245+X/2)-32)/4:IFJTHENA=(A-INT(A))*4
-3 J=NOTJ:POKE768+X,(PEEK(2144+X)-32)*4+A:NEXT:CALL768:REM+4PY_H&A\RH%A\B&N3 ""?2 29_*'222A^JN8 A,I\B( ^I\( ^I^B( ^I\( ^Y\B$SY\R$P,N)('&&%%$$##""!!!!       5 ="""". ! &.)+)!.*#!'$!( '  . !, ) "."!!+&"""')#)$ $,
+2 FOR X=0TO100:A=(PEEK(2245+X/2)-32)/4:IFJTHENA=(A-INT(A))*4
+3 J=NOTJ:POKE768+X,(PEEK(2144+X)-32)*4+A:NEXT:GR:CALL768:REM+4PY_H&A^RH%A^B&N3 ""?2 29_*'222A_JN8 A,I^B( ^I^( ^I_B( ^I^( ^Y^B$SY^R$P,N)('&&%%$$##""!!!!       5 =""*". ! &.)+)).*!!'$!( '  & !, ) "."!!+&"""')#)$ $,
diff --git a/bot_demo/CIRCLES.BAS b/bot_demo/CIRCLES.BAS
index 5a3b9e617f4ba06266f26fd5023131ea6b86049f..a72cb2fdf8ded9e46a1876c94b0bb8ec609db65e 100644
GIT binary patch
delta 124
zcmeyv_=l10H-j+;6T?J~VBZd_9&<Abt4-P_0g>?@YL0P19;%LUPHKL}3Q9`$MhZrj
z@mlIeMn;bDUVat|jyj%kP8tevo^c=|9?p!6b5aS8jGMSjNm5HmPeD;ZO;1x>Q&Ue%
SQBhq*QA0spK|yWeLumjV86Q3X

delta 124
zcmeyv_=l0>H-jk$6GMm9M7Ch>9&<Abt4-P_0g>?@YK}2M9;%KpPHKL}3Q9`$MhZrj
z@mlIeMn;ZtUVat|jyj$(P8tevo-rUI4$h2>aZ(A6jG4GhNm5BkPeD;ZO;1x>Q&CS#
SSy5d@QA0spK|ycgLumjR0v{*<

diff --git a/bot_demo/botdemo.s b/bot_demo/botdemo.s
index 374a9273..640cef98 100644
--- a/bot_demo/botdemo.s
+++ b/bot_demo/botdemo.s
@@ -170,4 +170,4 @@ original_stack:	.byte $00
 PT3_LOC = song
 .align	$100
 song:
-.incbin "music/Second_Best_2_Nothing.pt3"
+.incbin "music/A_UpBeat_Thingy.pt3"
diff --git a/bot_demo/timeline.inc b/bot_demo/timeline.inc
index 4fd8bd15..a6facf73 100644
--- a/bot_demo/timeline.inc
+++ b/bot_demo/timeline.inc
@@ -12,28 +12,24 @@
 todo_list:
 
 	.byte	DO_LOAD,1,	DO_LIST,4,	DO_RUN,5	; flame
-
+	.byte	DO_LOAD,1,	DO_LIST,4,	DO_RUN,15	; a2
+	.byte	DO_LOAD,1,	DO_LIST,4,	DO_RUN,10	; flyer
+	.byte	DO_LOAD,1,	DO_LIST,4,	DO_RUN,20	; nyan
+;	.byte	DO_LOAD,1,	DO_LIST,4,	DO_RUN,15	; rle
+	.byte	DO_LOAD,1,	DO_LIST,4,	DO_RUN,20	; raster
+	.byte	DO_LOAD,1,	DO_LIST,4,	DO_RUN,35	; qr
+	.byte	DO_LOAD,1,	DO_LIST,4,	DO_RUN,12	; dhgr
+	.byte	DO_LOAD,1,	DO_LIST,4,	DO_RUN,10	; circles
 	.byte	DO_LOAD,1,	DO_LIST,4,	DO_RUN,10	; autumn
 	.byte	DO_CREDITS,$FF
 	.byte	DONE,$FF
 
-	.byte	DO_LOAD,1,	DO_LIST,4,	DO_RUN,15	; a2
-	.byte	DO_LOAD,1,	DO_LIST,4,	DO_RUN,10	; flyer
-	.byte	DO_LOAD,1,	DO_LIST,4,	DO_RUN,15	; nyan
-;	.byte	DO_LOAD,1,	DO_LIST,4,	DO_RUN,15	; rle
-	.byte	DO_LOAD,1,	DO_LIST,4,	DO_RUN,15	; raster
-	.byte	DO_LOAD,1,	DO_LIST,4,	DO_RUN,15	; qr
-	.byte	DO_LOAD,1,	DO_LIST,4,	DO_RUN,10	; dhgr
-	.byte	DO_LOAD,1,	DO_LIST,4,	DO_RUN,10	; circles
-
 
 
 
 
 file_list:
 	.word	flame,flame_end
-	.word	autumn,autumn_end
-
 	.word	a2,a2_end
 	.word	flyer,flyer_end
 	.word	nyan,nyan_end
@@ -42,13 +38,13 @@ file_list:
 	.word	qr,qr_end
 	.word	dhgr,dhgr_end
 	.word	circles,circles_end
+	.word	autumn,autumn_end
+
 
 
 
 title_list:
 	.word	flame_title
-	.word	autumn_title
-
 	.word	a2_title
 	.word	flyer_title
 	.word	nyan_title
@@ -57,6 +53,8 @@ title_list:
 	.word	qr_title
 	.word	dhgr_title
 	.word	circles_title
+	.word	autumn_title
+
 
 
 ;              0123456789012345678901234567890123456789
@@ -65,7 +63,7 @@ flame_title:
 a2_title:
 	.byte "          LO-RES SELF PORTRAIT          "
 flyer_title:
-	.byte "        HI-RES SHAPETABLE FLYER         "
+	.byte "         HI-RES SHAPETABLE FLYER        "
 nyan_title:
 	.byte "        HI-RES ANIMATED NYAN CAT        "
 qr_title:
diff --git a/hellmood_memories/circles_normal.s b/hellmood_memories/circles_normal.s
index 8244b60b..602011c4 100644
--- a/hellmood_memories/circles_normal.s
+++ b/hellmood_memories/circles_normal.s
@@ -1,5 +1,7 @@
 ; Zooming Circles, based on the code in Hellmood's Memories
 
+; for use *not* in zero page (for appleii bot)
+
 ; by deater (Vince Weaver) <vince@deater.net>
 
 ; Zero Page
@@ -8,15 +10,15 @@ BASH		= $29
 H2		= $2C
 COLOR		= $30
 
-X1		= $F0
-X2		= $F1
-Y1		= $F2
-Y2		= $F3
+X1		= $F8
+X2		= $F9
+Y1		= $FA
+Y2		= $FB
 
-TEMP		= $FA
-TEMPY		= $FB
-FRAME		= $FC
-TEMPX		= $FD
+TEMP		= $FC
+TEMPY		= $FD
+FRAME		= $FE
+TEMPX		= $FF
 
 
 ; Soft Switches