Merge branch 'master' of https://github.com/a2-4am/4cade

res/attract/SKYFOX

@@ -0,0 +1 @@
+#

res/fx.conf

@@ -1 +1 @@
-RIPPLE
+RIPPLE

res/history.md

@@ -5,6 +5,7 @@
  - Added Flight Simulator II
  - Added Guardian
  - Added Short Circuit
+ - Added Skyfox
  - Removed Flight Simulator I
  - Combined Tetris 48K and Tetris 128K; just launch Tetris and it'll figure it out
 

res/notes/wishlist.txt

@@ -40,7 +40,6 @@ Roundabout
 Shanghai
 Shifty Sam
 Shuttle Intercept
-Skyfox
 Soko-Ban [DHGR] [priority]
 Spindizzy
 Station 5
@@ -78,6 +77,7 @@ Jawbreaker ][
 Mating Zone
 Randamn
 Saracen
+Super Zaxxon
 Test Drive [DHGR] [priority]
 
 //TODO(woz-imaged but uncracked)
@@ -114,8 +114,5 @@ Fly Wars
 Jellyfish
 Minotaur
 
-//TODO(unacquired)
-Super Zaxxon
-
 //TODO(unreleased)
 Crystal Castles

res/ss/ACTIONS2.CONF

@@ -1 +1 @@
-#
+#

res/ss/ACTIONS3.CONF

@@ -1 +1 @@
-#
+#

res/ss/ACTIONS4.CONF

@@ -1 +1 @@
-#
+#

res/ss/ACTIONS5.CONF

@@ -1 +1 @@
-#
+#

res/ss/EA.CONF

@@ -1 +1 @@
-#
+#

res/ss/S3.CONF

@@ -1 +1 @@
-#
+#

src/constants.a

@@ -6,7 +6,7 @@
 ; YE OLDE GRAND UNIFIED MEMORY MAP
 ;
 ; LC RAM BANK 1
-; D000..E611 - persistent data structures (per-game cheat categories,
+; D000..E635 - persistent data structures (per-game cheat categories,
 ;              gGlobalPrefsStore, gGamesListStore)
 ; ...unused...
 ; ECC6..FFF9 - main program code

src/fx/fx.hgr.corner.circle.a

@@ -1,16 +0,0 @@
-;license:MIT
-;(c) 2018 by 4am
-;
-!cpu 6502
-!to "build/FX/CORNER.CIRCLE",plain
-*=$6000
-
-         !source "src/fx/fx.hgr.precomputed.a"
-
-         +FX_PRECOMPUTED HGRHalfBlockCopy, Coordinates, $28
-
-         rts
-
-Coordinates
-         !source "src/fx/fx.hgr.corner.circle.data.a"
-         !byte $80

src/fx/fx.hgr.precomputed.a

@@ -1,44 +0,0 @@
-;license:MIT
-;(c) 2018 by 4am
-;
-coord = $FE
-
-         jmp   Start
-
-         !source "src/wait.a"
-         !source "src/fx/fx.hgr.common.a"
-
-Start
-
-!macro FX_PRECOMPUTED .copy, .coords, .wait {
-         lda   #<.coords
-         sta   coord
-         lda   #>.coords
-         sta   coord+1
-         ldy   #0
-@loop
-         lda   (coord),y
-         bpl   +
-         lda   #.wait
-         jsr   WaitForKeyWithTimeout
-         bmi   @exit
-         bpl   @next
-+        tax
-         iny
-         lda   (coord),y
-         tay
-         txa
-         jsr   .copy
-@next
-         inc   coord
-         bne   +
-         inc   coord+1
-+        inc   coord
-         bne   +
-         inc   coord+1
-+        ldy   #$00
-         lda   ($FE),y
-         cmp   #$80
-         bne   @loop
-@exit
-}

src/fx/fx.hgr.radial2.a

@@ -1,16 +0,0 @@
-;license:MIT
-;(c) 2018 by 4am
-;
-!cpu 6502
-!to "build/FX/RADIAL2",plain
-*=$6000
-
-         !source "src/fx/fx.hgr.precomputed.a"
-
-         +FX_PRECOMPUTED HGRHalfBlockCopy, Coordinates, $06
-
-         rts
-
-Coordinates
-         !source "src/fx/fx.hgr.radial2.data.a"
-         !byte $80

src/fx/fx.hgr.radial4.a

@@ -1,16 +0,0 @@
-;license:MIT
-;(c) 2018 by 4am
-;
-!cpu 6502
-!to "build/FX/RADIAL4",plain
-*=$6000
-
-         !source "src/fx/fx.hgr.precomputed.a"
-
-         +FX_PRECOMPUTED HGRHalfBlockCopy, Coordinates, $06
-
-         rts
-
-Coordinates
-         !source "src/fx/fx.hgr.radial4.data.a"
-         !byte $80

src/fx/fx.hgr.radial5.a

@@ -1,16 +0,0 @@
-;license:MIT
-;(c) 2018 by 4am
-;
-!cpu 6502
-!to "build/FX/RADIAL5",plain
-*=$6000
-
-         !source "src/fx/fx.hgr.precomputed.a"
-
-         +FX_PRECOMPUTED HGRHalfBlockCopy, Coordinates, $06
-
-         rts
-
-Coordinates
-         !source "src/fx/fx.hgr.radial5.data.a"
-         !byte $80

src/fx/fx.hgr.ripple2.a

@@ -1,16 +0,0 @@
-;license:MIT
-;(c) 2018 by 4am
-;
-!cpu 6502
-!to "build/FX/RIPPLE2",plain
-*=$6000
-
-         !source "src/fx/fx.hgr.precomputed.a"
-
-         +FX_PRECOMPUTED HGRHalfBlockCopy, Coordinates, $08
-
-         rts
-
-Coordinates
-         !source "src/fx/fx.hgr.ripple2.data.a"
-         !byte $80