From bd0570fff2a5cf730c72e77ebf95f886d446963a Mon Sep 17 00:00:00 2001
From: 4am <a2_4am@sent.com>
Date: Tue, 17 Apr 2018 16:25:38 -0400
Subject: [PATCH] .

---
 src/glue.common.a | 10 ++++++++++
 src/glue.zinfo.a  | 27 ++++++++++++---------------
 src/ui.artwork.a  |  3 ++-
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/glue.common.a b/src/glue.common.a
index 99b9961..16250c7 100644
--- a/src/glue.common.a
+++ b/src/glue.common.a
@@ -5,7 +5,16 @@
 ;
 ; Public functions
 ; - SetStartupPathToCurrentVersionOfCurrentGame
+;
 
+;------------------------------------------------------------------------------
+; SetStartupPathToCurrentVersionOfCurrentGame
+; gets path+filename of current version of current game and stores it in $2006
+;
+; in:    current ProDOS prefix is the same as the ONBEYOND.SYSTEM file
+; out:   all other registers and flags clobbered
+;------------------------------------------------------------------------------
+!zone {
 SetStartupPathToCurrentVersionOfCurrentGame
          jsr   ResetPath             ; gPathname = ''
 
@@ -28,3 +37,4 @@ SetStartupPathToCurrentVersionOfCurrentGame
 
          +LDADDR gPathname
          jmp   SetStartupPath        ; store gPathname at $2006 to pass it to interpreter
+}
diff --git a/src/glue.zinfo.a b/src/glue.zinfo.a
index b9f3d7c..1d46482 100644
--- a/src/glue.zinfo.a
+++ b/src/glue.zinfo.a
@@ -8,6 +8,7 @@
 ;
 ; Public variables
 ; - gSavedGamesStore
+; - gSavedGamesSlotsInUse
 ;
 
 ; TODO move these to a ZINFO_MLI kind of separate file
@@ -30,9 +31,10 @@ gSavedGamesSlotsInUse
 ; load ZINFO, call it with the current game, and parse the results
 ;
 ; in:    current ProDOS prefix is the same as the PITCH.DARK file
-; out:   C set if something went wrong
-;        C clear otherwise
+; out:   none
 ;------------------------------------------------------------------------------
+.error
+         jmp   SoftBell
 LoadSavedGameInfo
          jsr   okvs_init
          !word gSavedGamesStore
@@ -45,14 +47,8 @@ LoadSavedGameInfo
          bcs   .error
 
          jsr   SetStartupPathToCurrentVersionOfCurrentGame
-         jsr   kSystemAddress
-         jsr   zparse
-         clc
-         rts
-.error
-         jmp   SoftBell
+         jsr   kSystemAddress        ; call ZINFO (despite being a .SYSTEM program, it returns via RTS)
 
-zparse
          +LDADDR zinfo_base
          +STAY ZPTR
          ldx   #0
@@ -153,13 +149,14 @@ kLeftParen
          !byte 2
          !text " ("
 
-kRightParen
-         !byte 1
-         !text ")"
-kNullByte
-         !byte 1,0
-
 kSlash
          !byte 1
          !text "/"
+
+kRightParen
+         !byte 1
+         !text ")"
+
+kNullByte
+         !byte 1,0
 }
diff --git a/src/ui.artwork.a b/src/ui.artwork.a
index 714299a..560b142 100644
--- a/src/ui.artwork.a
+++ b/src/ui.artwork.a
@@ -6,11 +6,11 @@
 ; Public functions
 ; - DisplayArtwork
 ;
+
 kArtworkRootDirectory                ; length-prefixed pathname of DHGR graphic files
          !byte 8
          !raw  "ARTWORK/"
 
-!zone {
 ;------------------------------------------------------------------------------
 ; DisplayArtwork
 ; load and display double hi-res artwork, then wait for key or mouse click
@@ -18,6 +18,7 @@ kArtworkRootDirectory                ; length-prefixed pathname of DHGR graphic
 ; in:    WeeGUI initialized
 ; out:   all registers and flags clobbered
 ;------------------------------------------------------------------------------
+!zone {
 DisplayArtwork
          lda   #0                    ; set Z flag always
 !cpu 65816