From d87ece2fb937745b0f585470053250ead95c7b5b Mon Sep 17 00:00:00 2001 From: 4am Date: Fri, 23 Mar 2018 13:44:34 -0400 Subject: [PATCH] minor refactoring --- ...rk.master games collection.do.not.edit.2mg | Bin 33553984 -> 33553984 bytes src/action.a | 34 +++++++++++------- src/memory.a | 1 + 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/res/Pitch Dark.master games collection.do.not.edit.2mg b/res/Pitch Dark.master games collection.do.not.edit.2mg index 91d620ed5a6d4e5086aa75fe25c38f4742bd8ce0..d93680fe67c4181c329d8ca6cf3d91c2dbf9b2ef 100644 GIT binary patch delta 3322 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 J#J`_(-M==tg?9h| diff --git a/src/action.a b/src/action.a index c0d9478..cc0a047 100644 --- a/src/action.a +++ b/src/action.a @@ -134,7 +134,6 @@ HandleKey lda #0 .xyzzyStoreAndExit sta .xyzzy -.nope jmp SoftBell .xyzzy !byte $00 @@ -148,19 +147,21 @@ HandleKey jsr AddToPath jsr SetPrefix !word gPathname - bcs .nope + bcs .xyzzyError jsr ResetPath lda #<.dhrslideFilename ldy #>.dhrslideFilename jsr AddToPath jsr LoadFile !word gPathname - !word $2000 + !word kSystemAddress !word $2000 !word kProDOSFileBuffer - bcs .nope + bcs .xyzzyError jsr ExitWeeGUI - jmp $2000 + jmp kSystemAddress +.xyzzyError + jmp MainScreen .dhrslideFilename !byte 15 !raw "DHRSLIDE.SYSTEM" @@ -220,7 +221,7 @@ callback_boxart + jsr LoadDHRFile ; load artwork from file !word gPathname !word kProDOSFileBuffer - bcs .nope + bcs .boxartError sta $C000 ; display double hi-res page 1 sta $C00D @@ -238,7 +239,7 @@ callback_boxart sta $C001 ; back to text sta $C051 rts -.nope +.boxartError jmp SoftBell } @@ -246,7 +247,7 @@ callback_boxart callback_clues jsr SaveGlobalPreferences jsr LoadInterpreter - bcs .nope + bcs .cluesError ; change prefix to folder of file we want the interpreter to open jsr ResetPath lda #