move some things

src/4cade.a

@@ -76,15 +76,11 @@ RestoreStackNextTime
 STACKPTR
          ldx   #$D1                  ; SMC, restore stack pointer
          txs
-SwitchToBank1
+         jmp   SwitchToBank1         ; switch to bank 1 and return to caller
-         +READ_RAM1_WRITE_RAM1
-         rts                         ; and return to caller
 ResetVector                          ; 6 bytes, copied to $100
          +READ_RAM1_NO_WRITE
          jmp   Reenter
 
-Ignore   rti                         ; discard IRQs, particular on the IIc
-
          ; these routines will only be called after relocating to language card
          !source "src/ui.search.mode.a"         ; \__ execution falls through
          !source "src/ui.animation.a"           ; /

src/constants.a

@@ -9,14 +9,14 @@
 ; D000..E635 - persistent data structures (per-game cheat categories,
 ;              gGlobalPrefsStore, gGamesListStore)
 ; ...unused...
-; ECF3..FFF9 - main program code
+; ECF2..FFF9 - main program code
 ; FFFA..FFFF - NMI, reset, IRQ vectors
 ;
 ; LC RAM BANK 2
 ; D000..D3FF - ProRWTS data
 ; D400..D66F - ProRWTS code
-; D670..DB6B - HGR font code & ProRWTS glue code
+; D670..DB5F - HGR font code & ProRWTS glue code
-; DB6B..DB79 - backup of stack (during gameplay and self-running demos)
+; DB60..DB6E - backup of stack (during gameplay and self-running demos)
 ; ...unused...
 ; DBB2..DBFF - (de)acceleration function
 ; DC00..DFFF - HGR font data

src/glue.prorwts2.lc2.a

@@ -54,16 +54,15 @@ SaveSmallFileInternal
          +LDADDR gPathname
          +STAY namlo                 ; set filename for ProRWTS2
          jsr   traverse              ; go to subdirectory, set up filename for read
-         ;;if the write address is always a fixed value then we can discard the query
+         ;lda   #cmdread              ; read (instead of write)
-         lda   #cmdread              ; read (instead of write)
+         ;sta   reqcmd
-         sta   reqcmd
          lda   #0                    ; 0 = read into main memory
          sta   sizelo
-         sta   sizehi                ; 0 = query load address
+         ;sta   sizehi                ; 0 = query load address
-         jsr   hddopendir            ; call ProRWTS2
+         ;jsr   hddopendir            ; call ProRWTS2         
-         lda   ldrlo2
+         ;lda   ldrlo2
          sta   ldrlo
-         lda   ldrhi2
+         lda   #$80 ;lda   ldrhi2
          sta   ldrhi
          lda   #cmdwrite             ; write (instead of read)
          sta   reqcmd

src/ui.common.a

@@ -57,7 +57,7 @@ Home
          sta   CLOCKCTL              ; black border
          sta   CLOCKCTL              ; set twice for VidHD
 @noSHR
-         ldx   #(@end-@start-1)
+         ldx   #(.end-@start-1)
 -        lda   @start,x
          sta   $106,x
          dex
@@ -70,12 +70,12 @@ Home
          sta   DHIRESOFF             ; get out of DHGR mode
          jsr   $FB3C ;ROM_TEXTish    ; clear screen but don't show it
          jsr   ROM_HOME              ; HOME
-         lda   $C056
          lda   PAGE1
          lda   $C051                 ; now show it
+SwitchToBank1
          +READ_RAM1_WRITE_RAM1
-         rts
+         rts                         ; and return to caller
-@end
+.end
 
 ;------------------------------------------------------------------------------
 ; BlankDHGR

src/ui.offscreen.a

@@ -28,6 +28,7 @@
 ;        preserves X/Y
 ;------------------------------------------------------------------------------
 GetOffscreenAddress
+Ignore = * + 1                       ; discard IRQs, particularly on the IIc
          lda   #$40
 OffscreenPage = * + 1
          bne   +                     ; SMC