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

src/4cade.a

@@ -33,10 +33,8 @@ Main
          bpl   -
          inx
          stx   $3F2                  ; set up reset vectors
-         stx   $FFFC
          inx
          stx   $3F3
-         stx   $FFFD
          txa
          eor   #$A5
          sta   $3F4
@@ -83,6 +81,9 @@ Mode
          !source "src/ui.font.a"
 gGlobalPrefsStore
          !word $D000                 ; address of first okvs store
+         !word Reenter               ; NMI vector ($FFFA-B)
+         !word Reenter               ; reset vector ($FFFC-D)
+         !word Reenter               ; IRQ vector ($FFFE-F)
 }
 LastMover
          !source "src/ui.font.data.a"
@@ -90,6 +91,6 @@ LastMover
   !ifdef PASS2 {
   } else { ;PASS2
     !set PASS2=1
-    !warn "RELBASE = ", $FFFC - (LastMover - FirstMover)
+    !warn "RELBASE = ", $10000 - (LastMover - FirstMover)
   }
 }

src/4cade.init.a

@@ -28,14 +28,13 @@
 
          +READ_ROM_WRITE_RAM2
          jsr   init                  ; initialize and relocate ProRWTS2 to $D400 in RAM bank 2
+                                     ; ProRWTS2 disk-data live at $D000-D3FF
          ldx   #$00                  ; relocate program code to top of language card
-@FM      lda   FirstMover,x
-         sta   RELBASE,x
+                                     ; since we end at $0000 now, adjust low offset to avoid destroying zpage
+@FM      lda   FirstMover - (RELBASE & $FF),x
+         sta   RELBASE & $FF00,x
          inx
          bne   @FM
-         lda   @FM+2
-         cmp   #>LastMover
-         bcs   +
          inc   @FM+2
          inc   @FM+5
          bne   @FM