This commit is contained in:
4am 2019-06-30 15:18:51 -04:00
parent e01d66b46d
commit 5822a2b078
2 changed files with 7 additions and 9 deletions

View File

@ -197,10 +197,10 @@ RunAttractModule
cmp #$06 ; 1-5 are slideshow modules cmp #$06 ; 1-5 are slideshow modules
bcs @startDispatch bcs @startDispatch
; it's a slideshow, so load slideshow configuration file at $4000 ; it's a slideshow, so load and parse slideshow configuration file
pha ; save module type pha ; save module type
+LOAD_FILE kAttractModeSlideshowDirectory, @key +LOAD_FILE kAttractModeSlideshowDirectory, @key ; load slideshow configuration file at $4000
jsr ParseKeyValueList ; parse slideshow configuration into an OKVS data structure at $0800 jsr ParseKeyValueList ; parse into an OKVS data structure at $0800
!word gSlideshowStore !word gSlideshowStore
!word ldrlo2 ; (ldrlo2) points to address of last loaded file, so $4000 !word ldrlo2 ; (ldrlo2) points to address of last loaded file, so $4000
!byte 0 !byte 0
@ -228,6 +228,7 @@ RunAttractModule
!word SHRSingle !word SHRSingle
LoadAndParseAttractModeConf LoadAndParseAttractModeConf
; TODO refactor launch code then make this private
+LDADDR @AttractModeConfFile +LDADDR @AttractModeConfFile
jsr SetPath jsr SetPath
jsr LoadFile ; load attract-mode configuration file at $8000 jsr LoadFile ; load attract-mode configuration file at $8000

View File

@ -18,7 +18,7 @@ SHRSlideshow
+ jsr .LoadSHRTransition + jsr .LoadSHRTransition
jsr okvs_iter jsr okvs_iter
!word gSlideshowStore !word gSlideshowStore
!word SHRArtworkCallback !word .SHRArtworkCallback
jmp BlankHGR jmp BlankHGR
SHRSingle SHRSingle
@ -39,9 +39,6 @@ SHRSingle
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
; .LoadSHGRTransition [private] ; .LoadSHGRTransition [private]
; [TODO] for now there is only 1 SHR transition so this always load the same file
; [TODO] but eventually it should look up name of next SHR transition effect in
; [TODO] SFX.CONF or something and loads that file at $A000
; ;
; in: gSFXStore has been initialized ; in: gSFXStore has been initialized
; gGlobalPrefsStore has been initialized ; gGlobalPrefsStore has been initialized
@ -60,7 +57,7 @@ kSFXFizzleFile
@kSFXFizzleFile_e @kSFXFizzleFile_e
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
; SHRArtworkCallback ; .SHRArtworkCallback [private]
; callback called by okvs_iter on gSlideshowStore ; callback called by okvs_iter on gSlideshowStore
; to load and display a single SHR graphic ; to load and display a single SHR graphic
@ -71,7 +68,7 @@ kSFXFizzleFile
; $2000..$BFFF clobbered by graphics data and transition code ; $2000..$BFFF clobbered by graphics data and transition code
; $2000..$5FFF/aux clobbered ; $2000..$5FFF/aux clobbered
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
SHRArtworkCallback .SHRArtworkCallback
+STAY PTR +STAY PTR
lda KBD lda KBD