This commit is contained in:
4am 2018-03-31 11:25:42 -04:00
parent ec788a01f7
commit 72e4a7b6bf
3 changed files with 24 additions and 29 deletions

View File

@ -18,12 +18,6 @@ ACME=acme
# https://github.com/mach-kernel/cadius # https://github.com/mach-kernel/cadius
CADIUS=cadius CADIUS=cadius
md:
mkdir -p build
clean:
rm -rf build/
asm: md asm: md
$(ACME) -r build/grue.system.lst src/grue.system.s $(ACME) -r build/grue.system.lst src/grue.system.s
$(ACME) -r build/pitchdark.lst src/pitchdark.a $(ACME) -r build/pitchdark.lst src/pitchdark.a
@ -63,4 +57,10 @@ artwork: dsk
mount: dsk mount: dsk
osascript bin/V2Make.scpt "`pwd`" bin/pitchdark.vii build/"$(DISK)" osascript bin/V2Make.scpt "`pwd`" bin/pitchdark.vii build/"$(DISK)"
md:
mkdir -p build
clean:
rm -rf build/
all: clean asm dsk txt artwork mount all: clean asm dsk txt artwork mount

View File

@ -75,4 +75,5 @@ WGStrokeRoundRect = 82
WGCreateRadio = 84 WGCreateRadio = 84
WGReset = 86 WGReset = 86
WGGetState = 88 WGGetState = 88
WGPendingClick = 90

View File

@ -215,19 +215,8 @@ callback_next
callback_versions callback_versions
rts rts
callback_options
jmp OptionsDialog
!zone { !zone {
callback_boxart callback_boxart
jsr ResetPath
+LDADDR kArtworkRootDirectory
jsr AddToPath
jsr okvs_get
!word gGlobalPrefsStore
!word kLastPlayed
jsr AddToPath
lda #0 ; set Z flag always lda #0 ; set Z flag always
!cpu 65816 !cpu 65816
rep #2 ; clear Z flag on 65816 only rep #2 ; clear Z flag on 65816 only
@ -236,6 +225,15 @@ callback_boxart
lda $C029 lda $C029
and #$1F and #$1F
sta $C029 ; set GS NEWVIDEO mode to turn off linearize sta $C029 ; set GS NEWVIDEO mode to turn off linearize
+
jsr ResetPath
+LDADDR kArtworkRootDirectory
jsr AddToPath
jsr okvs_get
!word gGlobalPrefsStore
!word kLastPlayed
jsr AddToPath ; gPathname = 'ARTWORK/<game shortname>'
+ jsr LoadDHRFile ; load artwork from file + jsr LoadDHRFile ; load artwork from file
!word gPathname !word gPathname
@ -245,25 +243,21 @@ callback_boxart
sta $C000 ; display double hi-res page 1 sta $C000 ; display double hi-res page 1
sta $C00D sta $C00D
sta $C05E sta $C05E
sta $C001
sta $C057 sta $C057
sta $C052 sta $C052
sta $C054 sta $C054
sta $C050 sta $C050
bit $C010
bit $c010 - lda $C000
- lda $c000
bpl - bpl -
bit $c010 + bit $C010
sta $C051 ; back to text
sta $C001 ; back to text
sta $C051
rts rts
.boxartError .boxartError
jmp SoftBell jmp SoftBell
} }
callback_clues callback_options = OptionsDialog
jmp LaunchInterpreterWithHints callback_clues = LaunchInterpreterWithHints
callback_play = LaunchInterpreterWithGame
callback_play
jmp LaunchInterpreterWithGame