From 69919efe569ad928d30d164c38e69361255063e3 Mon Sep 17 00:00:00 2001
From: Peter Ferrie <peter.ferrie@gmail.com>
Date: Tue, 27 Sep 2022 19:05:09 -0700
Subject: [PATCH] fix typos and cosmetics

---
 res/DEMO/BATTLEZONE   | Bin 128 -> 128 bytes
 res/DEMO/GALAXIAN     | Bin 123 -> 123 bytes
 res/DEMO/PITFALL.II   | Bin 172 -> 131 bytes
 res/DEMO/TB           | Bin 121 -> 150 bytes
 src/demo/battlezone.a |   2 +-
 src/demo/galaxian.a   |   2 +-
 src/demo/pitfall.ii.a |  25 ++-----------------------
 src/demo/tubeway.a    |  11 ++++++++---
 8 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/res/DEMO/BATTLEZONE b/res/DEMO/BATTLEZONE
index b0766ef119e60c5e7777a3109290470dccf59636..f63d47cd28e10417baf7a66ff4dd5c06a40a344d 100644
GIT binary patch
delta 11
ScmZo*Y+#%a!1#S)pgsT=QUmM&

delta 11
ScmZo*Y+#%az<6n5pgsT<z5~Yq

diff --git a/res/DEMO/GALAXIAN b/res/DEMO/GALAXIAN
index 2f996b5a5dd383264e7ae11732e11db8cf854934..cbbd03f939872353a24a42ab2326f9736f9d6541 100644
GIT binary patch
delta 62
zcmb=f=Id=Zps@YEPWJ&IS~+PVpNd)s^W3K#dwZGZ2JoE{__(sHmw|I7b1x$&NadFM
Qy-f#v7&y+gPmE9o0AcGIz5oCK

delta 62
zcmb=f=Id=Zps@YEPWJ&IT3IxaPem<*dG1q=y}8VD1Ncq}d|VmU%fPvkxtEa>q;kvs
Q-lhXS3>@duCq^g(08Z-~9smFU

diff --git a/res/DEMO/PITFALL.II b/res/DEMO/PITFALL.II
index e5bff036784de6f9ebb5a9d63de439307007b657..e996fefdc4937ffbf0f08c209b56151776da8825 100755
GIT binary patch
delta 74
zcmZ3(*vvRV)}dknv%<^&y-f#JCiI%vDll-Y4DbEKypp;1GqdN?-Y?9HnD&M+&lOEL
dCGfqs;ef)H`#_~W3<(Oc%s_6=pZ^ov)Bu=YAnE`B

delta 115
zcmZo>T*Ej)Hgn+uW`&pkdz%idOz1VSRbb#)nc4e^c_nl2XJ*f(y<eCYG3`xYp8HjI
zZ!+^-Hod)R%yUH(P6@p3Z8)H?<vviG4?}`aKC@2^vrii{P%!7ue~XtKCz&QN`*5xE
R`MDO%+3?v%aoxmNH2^VEG7A6z

diff --git a/res/DEMO/TB b/res/DEMO/TB
index d523240ff4808cb46aaf6992c7359e714c2c2268..5ba868da464cbc779cd568287803f535b9cc2689 100755
GIT binary patch
delta 115
zcmV-(0F3{6mH}gpfWWQ!|BZscDS*%eOaK8agTO3<z#zBZtpV0ZtpnCbq5y_fsg9rn
zAn*TZjRV$bjRDrFOpT~(jV){-#!evYvZ4aLivyiTPn|@qohq%JhO3=qtjZAU=#KES
Vj`6dO^0SdkD+mWzFH}M=R6>)mH!%PJ

delta 86
zcmbQnSn1u{aA57v|GiBIG#f53`!Fy9`3l?b>vSIgqLpO}m=#`vBv<<MuE_4y%~3e!
or|@ReBBs5?%yZrR=en$&tF?A++v>R~YfcHgo|vr7%oO4T06sY>A^-pY

diff --git a/src/demo/battlezone.a b/src/demo/battlezone.a
index bc4579645..bb8849ac7 100644
--- a/src/demo/battlezone.a
+++ b/src/demo/battlezone.a
@@ -36,7 +36,7 @@
          bpl   -
 
          ldx   #4-1
-         lda   patch2,x
+-        lda   patch2,x
          sta   $168F,x    ; set exits
          dex
          bpl   -
diff --git a/src/demo/galaxian.a b/src/demo/galaxian.a
index b1cb9ff23..d558deda3 100644
--- a/src/demo/galaxian.a
+++ b/src/demo/galaxian.a
@@ -3,7 +3,7 @@
 
 !cpu 6502
 !to "res/DEMO/GALAXIAN",plain
-*=$300
+*=$320
 
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
diff --git a/src/demo/pitfall.ii.a b/src/demo/pitfall.ii.a
index 68a0743cb..a62dd2dff 100644
--- a/src/demo/pitfall.ii.a
+++ b/src/demo/pitfall.ii.a
@@ -19,10 +19,6 @@
          +RESET_VECTOR reset
          ldx   #3-1
 -        lda   patch,x
-         sta   $2DF5,x
-         lda   patch2,x
-         sta   $2E06,x
-         lda   patch3,x
          sta   $6015,x
          dex
          bpl   -
@@ -31,30 +27,13 @@
 
          jmp   $6000      ;612A copies pages 2E & 2F to AE & AF for final location
 
-patch    !byte $4C,<callback1,>callback1
-patch2   !byte $4C,<callback2,>callback2
-patch3   !byte $4C,<callback3,>callback3
+patch    !byte $20,<callback,>callback
 
 reset
          +READ_RAM2_NO_WRITE
          jmp   ($FFFC)
 
-callback1
-         sec
-         sbc   #8
-         cmp   #2
-         bcc   +
--        jmp   $AE0A
-+        jmp   $ADF9
-
-callback2
-         sec
-         sbc   #8
-         cmp   #2
-         bcs   -
-         jmp   $AE21
-
-callback3
+callback
          ldx   #6-1
 p1       lda   $100, x
          sta   $6055, x
diff --git a/src/demo/tubeway.a b/src/demo/tubeway.a
index aa1ed7e7c..85dc3a884 100644
--- a/src/demo/tubeway.a
+++ b/src/demo/tubeway.a
@@ -9,8 +9,9 @@
          !source "src/macros.a"
 
          +GAME_REQUIRES_JOYSTICK
-         +ENABLE_ACCEL_LC
-         +LOAD_XSINGLE title
+         +READ_RAM2_WRITE_RAM2
+         jsr   EnableAccelerator
+         +LOAD_FILE_AT title, $00
          lda   #$4C
          sta   $6BA8
          sta   $6C2D
@@ -25,6 +26,10 @@
          sta   $AC64,x
          dex
          bpl   -
+         inx
+         stx   $B3F0
+         stx   $B3F1
+         stx   $B3F2    ; erase high score
          lda   #$10
          sta   $AD28
          sta   $AB84
@@ -42,7 +47,7 @@
 patch    !byte $4C,$00,$01
 
 title    !byte x_e-x_b
-x_b      !text "TB"
+x_b      !text "X/TB/TB"
 x_e
 
 !if * > $3F0 {