consolidate bank switching code where possible

This commit is contained in:
4am 2019-09-20 09:33:23 -04:00
parent ad328e525c
commit a5120905e9
5 changed files with 24 additions and 26 deletions

View File

@ -108,6 +108,12 @@ gGlobalPrefsStore
!word $D100
gGamesListStore
!word $FDFD ; SMC
SwitchToBank1
+READ_RAM1_WRITE_RAM1
rts
SwitchToBank2
+READ_RAM2_WRITE_RAM2
rts
!word Reenter ; NMI vector ($FFFA-B)
!word Reenter ; reset vector ($FFFC-D)
!word Reenter ; IRQ vector ($FFFE-F)

View File

@ -184,7 +184,7 @@ OneTimeSetup
lda hddopendir+1 ; save current directory as 'root'
ldy hddopendir+3
+READ_RAM1_WRITE_RAM1
jsr SwitchToBank1
+STAY gRootDirectory
jsr LoadFile ; load preferences file into $8000

View File

@ -15,31 +15,26 @@
;
DrawPage
+READ_RAM2_WRITE_RAM2
jsr SwitchToBank2
jsr DrawPageInternal
+READ_RAM1_WRITE_RAM1
rts
jmp SwitchToBank1
Draw40Chars
+READ_RAM2_WRITE_RAM2
jsr SwitchToBank2
jsr Draw40CharsInternal
+READ_RAM1_WRITE_RAM1
rts
jmp SwitchToBank1
DrawCenteredString
+READ_RAM2_WRITE_RAM2
jsr SwitchToBank2
jsr DrawCenteredStringInternal
+READ_RAM1_WRITE_RAM1
rts
jmp SwitchToBank1
DrawString
+READ_RAM2_WRITE_RAM2
jsr SwitchToBank2
jsr DrawStringInternal
+READ_RAM1_WRITE_RAM1
rts
jmp SwitchToBank1
DrawBuffer
+READ_RAM2_WRITE_RAM2
jsr SwitchToBank2
jsr DrawBufferInternal
+READ_RAM1_WRITE_RAM1
rts
jmp SwitchToBank1

View File

@ -214,7 +214,7 @@ gCurrentlyVisibleSlideshowIndex
; execution falls through here
Launch
+READ_RAM2_WRITE_RAM2
jsr SwitchToBank2
jsr SaveOrRestoreScreenHoles ; save screen hole contents
ldx #$F1
- lda $100,x

View File

@ -55,10 +55,9 @@ LoadFile
jsr AddToPath
+LDPARAM 5
+STAY ldrlo ; set load address
+READ_RAM2_WRITE_RAM2
jsr SwitchToBank2
jsr LoadFileInternal
+READ_RAM1_WRITE_RAM1
rts
jmp SwitchToBank1
;------------------------------------------------------------------------------
; LoadDHRFile
@ -82,10 +81,9 @@ LoadDHRFile
jsr SetPath
+LDPARAM 3
jsr AddToPath
+READ_RAM2_WRITE_RAM2
jsr SwitchToBank2
jsr LoadDHRFileInternal
+READ_RAM1_WRITE_RAM1
rts
jmp SwitchToBank1
;------------------------------------------------------------------------------
; SaveSmallFile
@ -105,7 +103,6 @@ SaveSmallFile
+PARAMS_ON_STACK 2
+LDPARAM 1
+STAY ldrlo ; set data buffer address for ProRWTS2
+READ_RAM2_WRITE_RAM2
jsr SwitchToBank2
jsr SaveSmallFileInternal
+READ_RAM1_WRITE_RAM1
rts
jmp SwitchToBank1