diff --git a/src/parse.prefs.a b/src/parse.prefs.a index 6743763b4..0e528b7d0 100644 --- a/src/parse.prefs.a +++ b/src/parse.prefs.a @@ -15,10 +15,6 @@ kGlobalPrefsBuffer = $8000 -kGlobalPrefsFilename - !byte 10 - !raw "PREFS.CONF" - ; valid pref keys kNextAttract !byte 11 diff --git a/src/prodos.path.a b/src/prodos.path.a index ce4c9a63c..632c1b8c3 100644 --- a/src/prodos.path.a +++ b/src/prodos.path.a @@ -60,21 +60,45 @@ kStandardPrelaunch !byte 8 !raw "STANDARD" +kGlobalPrefsFilename + !byte 10 + !raw "PREFS.CONF" + +kAttractModeConfFile + !byte 12 + !raw "ATTRACT.CONF" + kFXConfFile !byte 7 - !text "FX.CONF" + !raw "FX.CONF" kDFXConfFile !byte 8 - !text "DFX.CONF" + !raw "DFX.CONF" kCreditsFile !byte 7 - !text "CREDITS" + !raw "CREDITS" + +kTitleFile + !byte 5 + !raw "TITLE" + +kCoverFile + !byte 5 + !raw "COVER" kCoverFadeFile !byte 9 - !text "COVERFADE" + !raw "COVERFADE" + +kGRFizzleFile + !byte 9 + !raw "GR.FIZZLE" + +kSFXFizzleFile + !byte 10 + !raw "SHR.FIZZLE" ;------------------------------------------------------------------------------ ; SetPath/AddToPath diff --git a/src/ui.attract.gr.a b/src/ui.attract.gr.a index 0f6b25b30..fffa2ea5c 100644 --- a/src/ui.attract.gr.a +++ b/src/ui.attract.gr.a @@ -66,9 +66,6 @@ BlankGR !word kGRFizzleFile !word $6400 rts -kGRFizzleFile - !byte 9 - !text "GR.FIZZLE" ;------------------------------------------------------------------------------ ; .GRActionCallback [private] diff --git a/src/ui.attract.mode.a b/src/ui.attract.mode.a index 7a4d48c9a..02c54a7e7 100644 --- a/src/ui.attract.mode.a +++ b/src/ui.attract.mode.a @@ -233,7 +233,3 @@ RunAttractModule !byte >DHGRSingle !byte >SHRSingle !byte >GRSingle - -kAttractModeConfFile - !byte 12 - !text "ATTRACT.CONF" diff --git a/src/ui.attract.shr.a b/src/ui.attract.shr.a index fa7baf1a5..b3148caa2 100644 --- a/src/ui.attract.shr.a +++ b/src/ui.attract.shr.a @@ -48,9 +48,6 @@ SHRSingle !word kSFXFizzleFile !word $A000 rts -kSFXFizzleFile - !byte 10 - !text "SHR.FIZZLE" ;------------------------------------------------------------------------------ ; .SHRArtworkCallback [private] diff --git a/src/ui.common.a b/src/ui.common.a index aaea8a27b..97ded5277 100644 --- a/src/ui.common.a +++ b/src/ui.common.a @@ -111,7 +111,7 @@ GetOffscreenAddress ; out: all flags and registers clobbered ;------------------------------------------------------------------------------ LoadTitleOffscreen - +LDADDR .TitleFile + +LDADDR kTitleFile bne + ; Always branches, because Y is loaded ; last with the high byte of the address, ; which is never 0. I miss my 65c02. @@ -125,7 +125,7 @@ LoadTitleOffscreen ;------------------------------------------------------------------------------ LoadCoverOffscreen ; clobbers all - +LDADDR .CoverFile + +LDADDR kCoverFile + +STAY @fname jsr GetOffscreenAddress @@ -136,12 +136,6 @@ LoadCoverOffscreen !byte $00 + !byte $FD ; SMC rts -.TitleFile - !byte 5 - !text "TITLE" -.CoverFile - !byte 5 - !text "COVER" LoadGameTitleOffscreen ; in: X = game index