.

src/glue.onbeyond.a

@@ -88,22 +88,18 @@ LaunchInterpreterWithHints
          bcs   .launchError
 
          jsr   ResetPath
-
          +LDADDR kHintsRootDirectory
          jsr   AddToPath
-
-         jsr   SetPrefix
-         !word gPathname
-         bcs   .launchError
-
          jsr   okvs_get
          !word gGlobalPrefsStore
          !word kLastPlayed
-         jsr   SetStartupPath        ; store hints filename at $2006
+         jsr   AddToPath
+         +LDADDR gPathname
+         jsr   SetStartupPath        ; store hints path+filename at $2006
 
-         jsr   ExitWeeGUI
-         jsr   SetInterpreterOptionsExceptForce40
-         jmp   kSystemAddress
+         jsr   ExitWeeGUI            ; shut down WeeGUI
+         jsr   SetInterpreterOptionsExceptForce40 ; set options struct at $300, but force 80 columns
+         jmp   kSystemAddress        ; exit via interpreter
 
 ;------------------------------------------------------------------------------
 ; internal functions

src/ui.main.keys.a

@@ -131,28 +131,30 @@ HandleKey
          sta   .xyzzy
          jmp   SoftBell
 .xyzzy
-         !byte $00
+         !byte 0
 .xyzzyGo
          jsr   SaveGlobalPreferences
          jsr   ResetPath
          +LDADDR kArtworkRootDirectory
          jsr   AddToPath
-         jsr   SetPrefix
-         !word gPathname
+
+         jsr   SetPrefix             ; must set ProDOS prefix to directory where DHGR files actually are
+         !word gPathname             ; (DHRSLIDE does not look in subdirectories)
          bcs   .xyzzyError
+
          jsr   ResetPath
-         +LDADDR .dhrslideFilename
+         +LDADDR kDHRSLIDEFilename
          jsr   AddToPath
-         jsr   LoadFile
+
+         jsr   LoadFile              ; load DHRSLIDE program at $2000
          !word gPathname
          !word kSystemAddress
          !word kProDOSFileBuffer
-         bcs   .xyzzyError
-         jsr   ExitWeeGUI
-         jmp   kSystemAddress
-.xyzzyError
-         jmp   MainScreen
-.dhrslideFilename
+
+         jsr   ExitWeeGUI            ; shut down WeeGUI
+         jmp   kSystemAddress        ; exit via DHRSLIDE
+
+kDHRSLIDEFilename
          !byte 15
          !raw  "DHRSLIDE.SYSTEM"
 }