diff --git a/res/ACTION.DHGR/_FileInformation.txt b/res/ACTION.DHGR/_FileInformation.txt index d48054888..9b91c81a6 100644 --- a/res/ACTION.DHGR/_FileInformation.txt +++ b/res/ACTION.DHGR/_FileInformation.txt @@ -70,8 +70,6 @@ SUMMER.EDITION=Type(06),AuxType(3FF8),Access(C3) SUMMER.EDITION2=Type(06),AuxType(3FF8),Access(C3) SUMMER.EDITION3=Type(06),AuxType(3FF8),Access(C3) TECHNOCOP=Type(06),AuxType(3FF8),Access(C3) -TECHNOCOP.AUX=Type(06),AuxType(3FF8),Access(C3) -TECHNOCOP.BIN=Type(06),AuxType(3FF8),Access(C3) TETRIS=Type(06),AuxType(3FF8),Access(C3) TETRIS2=Type(06),AuxType(3FF8),Access(C3) TETRIS3=Type(06),AuxType(3FF8),Access(C3) diff --git a/src/4cade.a b/src/4cade.a index 9b14dcd5e..95d4350e2 100644 --- a/src/4cade.a +++ b/src/4cade.a @@ -1,5 +1,5 @@ ;license:MIT -;(c) 2018-20 by 4am +;(c) 2018-2020 by 4am ; !cpu 6502 !to "build/LAUNCHER.SYSTEM",plain diff --git a/src/4cade.init.a b/src/4cade.init.a index 3e6149135..b7ad24ea9 100644 --- a/src/4cade.init.a +++ b/src/4cade.init.a @@ -1,5 +1,5 @@ ;license:MIT -;(c) 2018-20 by 4am +;(c) 2018-2020 by 4am ; ; first-run initialization code ; diff --git a/src/hw.accel.a b/src/hw.accel.a index 37c2fa2f7..e83e7e913 100755 --- a/src/hw.accel.a +++ b/src/hw.accel.a @@ -1,5 +1,5 @@ ;license:MIT -;(c) 2019 by 4am & qkumba +;(c) 2019-2020 by 4am & qkumba ; ; Functions to enable and disable acceleration on various ; Apple II models, cards, and environments diff --git a/src/hw.mockingboard.a b/src/hw.mockingboard.a index b18fe4a9f..1281c575a 100644 --- a/src/hw.mockingboard.a +++ b/src/hw.mockingboard.a @@ -1,6 +1,5 @@ ;license:MIT -;(c) 2019-20 by Andrew Roughan, qkumba -; in the style of 4am for Total Replay +;(c) 2019-2020 by Andrew Roughan, qkumba, 4am ; ; Mockingboard support functions ; diff --git a/src/parse.prefs.a b/src/parse.prefs.a index fad826e1e..42dc7da52 100644 --- a/src/parse.prefs.a +++ b/src/parse.prefs.a @@ -1,5 +1,5 @@ ;license:MIT -;(c) 2018-9 by 4am +;(c) 2018-2020 by 4am ; ; Parser for global preferences file ; diff --git a/src/prodos.path.a b/src/prodos.path.a index 8602d0b07..9f65608ca 100644 --- a/src/prodos.path.a +++ b/src/prodos.path.a @@ -1,5 +1,5 @@ ;license:MIT -;(c) 2018-9 by 4am +;(c) 2018-2020 by 4am ; ; ProDOS - functions for constructing and passing around ProDOS pathnames ; diff --git a/src/ui.attract.dhgr.a b/src/ui.attract.dhgr.a index dda45474b..cc027ba37 100644 --- a/src/ui.attract.dhgr.a +++ b/src/ui.attract.dhgr.a @@ -9,6 +9,8 @@ ; - DHGRSingle ; - BlankHGR ; - HGRMode +; - ForceHGRMOde +; - DrawGameTitleInActionSlideshowHGR ; - RedrawForDHGR ; @@ -108,9 +110,17 @@ GRMode bit $C050 DHGRRTS rts +;------------------------------------------------------------------------------ +; ForceHGRMode +; if machine is in DHGR mode, switch it back to HGR mode +; otherwise do nothing +; +; in: none +; out: see BlankHGR +;------------------------------------------------------------------------------ ForceHGRMode gMachineInDHGRMode=*+1 - lda #$00 + lda #$00 ; SMC bne BlankHGR beq DHGRRTS diff --git a/src/ui.attract.gr.a b/src/ui.attract.gr.a index 9c1bb5901..0b227706e 100644 --- a/src/ui.attract.gr.a +++ b/src/ui.attract.gr.a @@ -17,11 +17,11 @@ ; graphics mode set to display hi-res screen ;------------------------------------------------------------------------------ GRActionSlideshow - jsr .LoadGRTransition ; load transition effect code at $6000 + jsr LoadGRTransition ; load transition effect code at $6000 jsr BlankGR ; switch GR mode with initial blank screen jsr okvs_iter ; cycle through all listed GR files !word gSlideshowStore - !word .GRActionCallback ; address of callback (called on each file) + !word GRActionCallback ; address of callback (called on each file) jmp BlankHGR ; switch back to HGR mode with initial blank screen on exit ;------------------------------------------------------------------------------ @@ -39,7 +39,7 @@ GRSingle !word kRootDirectory @fname !word $FDFD ; SMC !word $6000 - jsr .LoadGRTransition ; load transition effect code at $6400 + jsr LoadGRTransition ; load transition effect code at $6400 jsr ExecuteTransitionAt6400AndWait jmp BlankHGR ; switch back to HGR mode with initial blank screen on exit @@ -70,7 +70,7 @@ BlankGR ; $6400..$BFFF/main contains transition effect code (probably not all ; of that, but no promises) ;------------------------------------------------------------------------------ -.LoadGRTransition +LoadGRTransition jsr LoadFile !word kFXDirectory !word kGRFizzleFile @@ -89,7 +89,7 @@ GRRTS rts ; $0800..$1EFF preserved (this contains the gSlideshowStore OKVS data) ; $2000..$BFFF clobbered by graphics data and transition code ;------------------------------------------------------------------------------ -.GRActionCallback +GRActionCallback bit KBD bmi GRRTS diff --git a/src/ui.browse.mode.a b/src/ui.browse.mode.a index af710e951..9c6d513f4 100644 --- a/src/ui.browse.mode.a +++ b/src/ui.browse.mode.a @@ -1,5 +1,5 @@ ;license:MIT -;(c) 2018-9 by 4am +;(c) 2018-2020 by 4am ; ; Browse Mode - main UI ; diff --git a/src/ui.common.a b/src/ui.common.a index 522047407..a49cdbac3 100755 --- a/src/ui.common.a +++ b/src/ui.common.a @@ -1,5 +1,5 @@ ;License:MIT -;(c) 2018-9 by 4am +;(c) 2018-2020 by 4am ; ; miscellaneous UI functions ; diff --git a/src/ui.font.a b/src/ui.font.a index e11331067..5d28cbc8b 100644 --- a/src/ui.font.a +++ b/src/ui.font.a @@ -14,7 +14,6 @@ ; - DrawBuffer ; - ; /!\ execution falls through from ui.attract.hgr/HGRActionCallback DrawString jsr SwitchToBank2 jsr DrawStringInternal diff --git a/src/ui.font.lc2.a b/src/ui.font.lc2.a index 95f322aca..c0807c7be 100644 --- a/src/ui.font.lc2.a +++ b/src/ui.font.lc2.a @@ -1,5 +1,5 @@ ;license:MIT -;(c) 2018-9 by 4am +;(c) 2018-2020 by 4am ; ; hi-res font drawing routines ; diff --git a/src/ui.overlay.a b/src/ui.overlay.a index 178316e2d..e57fc5489 100644 --- a/src/ui.overlay.a +++ b/src/ui.overlay.a @@ -1,5 +1,5 @@ ;License:MIT -;(c) 2018-9 by 4am +;(c) 2018-2020 by 4am ; ; routines for drawing the UI overlay (search bar, browse bar, instructions, cheat mode) ; on top of whatever else is on the screen diff --git a/src/ui.search.mode.a b/src/ui.search.mode.a index 2ca5efc79..4209b90dd 100644 --- a/src/ui.search.mode.a +++ b/src/ui.search.mode.a @@ -1,5 +1,5 @@ ;license:MIT -;(c) 2018-9 by 4am +;(c) 2018-2020 by 4am ; ; Search Mode - main UI ; diff --git a/src/ui.wait.a b/src/ui.wait.a index 97323b69c..14ee5e87d 100644 --- a/src/ui.wait.a +++ b/src/ui.wait.a @@ -1,5 +1,5 @@ ;License:MIT -;(c) 2018-9 by 4am +;(c) 2018-2020 by 4am ; ; UI functions for doing things then waiting, or waiting then doing things ;