From 380a8ce7ba355f7c620afff89e693d2e917a5480 Mon Sep 17 00:00:00 2001
From: frankmilliron <34376619+frankmilliron@users.noreply.github.com>
Date: Sun, 31 Oct 2021 13:58:09 -0700
Subject: [PATCH] fix some demo launcher IRQ & reset issues (#413)

* Add files via upload

* Add files via upload

* Add files via upload
---
 res/DEMO/GAMMA.GOBLINS   | Bin 146 -> 152 bytes
 res/DEMO/ROBOTRON.2084   | Bin 143 -> 131 bytes
 res/DEMO/SPACE.QUARKS    | Bin 173 -> 173 bytes
 res/DEMO/STARGATE        | Bin 173 -> 179 bytes
 res/DEMO/TUNNEL.TERROR   | Bin 206 -> 209 bytes
 src/demo/gamma.goblins.a |   2 +-
 src/demo/robotron.a      |  30 +++++++++++++++++++-----------
 src/demo/space.quarks.a  |  16 +++++++++++++---
 src/demo/stargate.a      |   6 ++++--
 src/demo/tunnel.terror.a |   1 +
 10 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/res/DEMO/GAMMA.GOBLINS b/res/DEMO/GAMMA.GOBLINS
index cd52363e76d38345ef1cdeaa6849504606a9f488..2ecd11441e397e9e54cf85c17e5995265b118458 100755
GIT binary patch
delta 47
zcmV+~0MP%E0hj@h7A1P1upsaMXpIBZXpI5XsbGyXARquBsQ``g1C9OzsR51i1C9TY
FHC@<^6eR!v

delta 41
zcmV+^0M`GQ0g?fb79Vt=upsaMXpIBZXpI5XsbGyXARquBsQ``g1E~Rx^N~AUWF`>;

diff --git a/res/DEMO/ROBOTRON.2084 b/res/DEMO/ROBOTRON.2084
index 164c8fb02253fa46ba258c485b2fd1ec56c5217f..389cca27b176d3a2b169b4d79d02414b77d0ece1 100644
GIT binary patch
delta 109
zcmeBYY-UW=X+8i%3fpflVrUC%3tf42!G4AJ|5r}#l@nRHzgJ$whe2c|L+>Z%-ha$1
z8GAo7_x@-0T-y7Ec@gX0GyCT{xt<dEzKCh>rTufQK+KgFdaYR%w%pcfI^ZMfu(sns
N&Y%B2POcLR<pArKGtK}2

literal 143
zcmdOCKA_WlKw<mswTxFh)-qr5Sj5m4y7J+I{R;2@XY?{($>?RgvT|XsoXE=kz49VH
z3?eHTdOtC*WbFOS?76h}3-cn@y|?$zb#gr=@O`CEua)acr(SE<m9D)ut}8F}TC?gj
n98lPDTc_!OkEp}ijsrP={>w(_2l+eshXnci=@}VVn4t0iiwivU

diff --git a/res/DEMO/SPACE.QUARKS b/res/DEMO/SPACE.QUARKS
index ddc4c3e070bbf2e68068224b95f06ef5398bf159..bde81d95b110436a34ac690a9dc29b0b44833956 100755
GIT binary patch
delta 38
ucmZ3>xR!B(stiN#7Kh#g4l5aZw>tD5bXd8hcbmgXpWc&p3aNGz9diIQI1o?(

delta 38
ucmZ3>xR!B(s*F$XNjrs9yOj*RpO}09F|TCo{mk6^pLyky-Y?7(9diIE;1E>+

diff --git a/res/DEMO/STARGATE b/res/DEMO/STARGATE
index d268a1a01f561a7e296c52a1c38919fedf25c2d3..4af5e493e0867c770715c3c31bb62ddfafb0bee9 100755
GIT binary patch
delta 42
zcmV+_0M-Ak0kZ*+76G4;7e*V6{zs_+jW-F62MLYIQH|75jq^v1|3|5$jr5UnJ7ISc
AmjD0&

delta 36
scmdnYxR!B(7~{-|;%=fV8GFq+d)YaAPX_j03GDsszH&+Lw}}<j0PedE?f?J)

diff --git a/res/DEMO/TUNNEL.TERROR b/res/DEMO/TUNNEL.TERROR
index b47c07ba27bbc04484faa6e7c8d59b1f786bdb27..5f66144c6498f3c1e4b2beb32730c022ef1d328e 100755
GIT binary patch
delta 17
ZcmX@dc#&~}7~|%N;=WA(nI|S^0{}T-22=n5

delta 14
Vcmcb}c#d&`7~_VC;=U8pvj8Y^1yBG0

diff --git a/src/demo/gamma.goblins.a b/src/demo/gamma.goblins.a
index 1456d2f6c..ad212a164 100644
--- a/src/demo/gamma.goblins.a
+++ b/src/demo/gamma.goblins.a
@@ -16,7 +16,7 @@
          sta   $2034
          jsr   $2000      ; decompress
 
-         +RESET_VECTOR $100
+         +RESET_AND_IRQ_VECTOR $100
 
          lda   #$4C
          sta   $5B9A
diff --git a/src/demo/robotron.a b/src/demo/robotron.a
index 40f5ea566..ba4be832e 100644
--- a/src/demo/robotron.a
+++ b/src/demo/robotron.a
@@ -10,7 +10,13 @@
 
          +READ_RAM2_WRITE_RAM2
          jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
+
+;+LOAD_FILE_KEEP_DIR
+         ldx   #0         ; read to main memory
+         stx   ldrhi
+         stx   ldrlo
+         +LDADDR title
+         jsr   iLoadFileDirect
 
          lda   #<callback
          sta   $141D+1
@@ -18,29 +24,31 @@
          sta   $141D+2
          jmp   $1400      ; decompress
 
-callback +RESET_VECTOR $100
+callback +RESET_AND_IRQ_VECTOR $100
 
          ldx   #6-1
--        lda   patch, x
+-        lda   patch1, x
          sta   $4542, x
          dex
          bpl   -          ; exit on keypress
 
-         lda   #$4C
-         sta   $453A
-         lda   #$42
-         sta   $453A+1
-         lda   #$45
-         sta   $453A+2    ; exit at end of demo cycle
+         ldx   #3-1
+-        lda   patch2, x
+         sta   $453A, x
+         dex
+         bpl   -          ; exit at end of demo cycle
 
          lda   #$D0
          sta   $053B      ; disable sound
 
-         +DISABLE_ACCEL
+         jsr   DisableAccelerator
+         +READ_ROM_NO_WRITE
 
          jmp   $4015
 
-patch    !byte $AD,$88,$C0,$6C,$FC,$FF
+patch1   !byte $AD,$88,$C0,$6C,$FC,$FF
+
+patch2   !byte $4C,$42,$45
 
 title    !byte x_e-x_b
 x_b      !text "X/ROBOTRON.2084/ROBOTRON.2084"
diff --git a/src/demo/space.quarks.a b/src/demo/space.quarks.a
index 4d4e10f60..418d2032c 100644
--- a/src/demo/space.quarks.a
+++ b/src/demo/space.quarks.a
@@ -1,5 +1,5 @@
 ;license:MIT
-;(c) 2021 by qkumba
+;(c) 2021 by qkumba/Frank M.
 
 !cpu 6502
 !to "res/DEMO/SPACE.QUARKS",plain
@@ -11,10 +11,20 @@
          +READ_RAM2_WRITE_RAM2
          jsr   EnableAccelerator
          +LOAD_FILE_AT space_quarks, $00
+
+         lda   #0
+         sta   $40B4      ; (moved to $3F2) reset fix
+         sta   $40C0      ; (moved to $3FE) IRQ fix
+         lda   #1
+         sta   $40B4+1
+         sta   $40C0+1
+         lda   #$A4
+         sta   $40B4+2
+
          lda   #$4C
          sta   $3EC9
-         jsr   $3E65      ; decompress/set reset vector
-         +RESET_AND_IRQ_VECTOR $100
+         jsr   $3E65      ; decompress
+
          lda   #$EA
          sta   $1C38
          sta   $1C39
diff --git a/src/demo/stargate.a b/src/demo/stargate.a
index 7da7baa7e..6a2d1ca69 100644
--- a/src/demo/stargate.a
+++ b/src/demo/stargate.a
@@ -34,15 +34,17 @@
          sta   $0905+1
          sta   $51C7+1
          sta   $51D2+1
-         sta   $47F2
+         sta   $47F2      ; fix reset (moved to $3F2/$3F3/$3F4)
+         sta   $47FE      ; fix IRQ (moved to $3FE/$3FF)
          lda   #1
          sta   $0933+4
          sta   $0905+2
          sta   $51C7+2
          sta   $51D2+2    ; set exits
          sta   $47F2+1
+         sta   $47FE+1
          lda   #$A4
-         sta   $47F4+2    ; reset vector fix (moved to $3F2/$3F4)
+         sta   $47F2+2    ; fix reset checksum
 
          lda   #$D0
          sta   $153B
diff --git a/src/demo/tunnel.terror.a b/src/demo/tunnel.terror.a
index bc1427db2..c5cd4d04f 100644
--- a/src/demo/tunnel.terror.a
+++ b/src/demo/tunnel.terror.a
@@ -37,6 +37,7 @@
          sta   $0F5D+1
          sta   $0F72+1
          lda   #1
+         sta   $03FF       ; fix IRQ
          sta   $0EFE+2
          sta   $06A4+2
          sta   $AD10+2