@@ 41,10 41,8 @@
#ff ;draw-menu/sel STA
#ff ;draw-sub/sel STA
-
#0701 ;draw-menu/theme STA2
#0d07 ;draw-sub/theme STA2
-
;draw-menu JSR2
JMP2r
@@ 114,10 112,14 @@ JMP2r
@menu-close ( -- )
;untrap JSR2
- ( hide ) ;draw-menu/sel LDA #00 ;draw-sub JSR2
- #ff ;draw-menu/sel STA
- ;draw-menu JSR2
- ;redraw-all JSR2
+ ;draw-menu/sel LDA
+ DUP #ff EQU ,&no-clear JCN
+ DUP #00 ;draw-sub JSR2
+ #ff ;draw-menu/sel STA
+ ;draw-menu JSR2
+ ;redraw-all JSR2
+ &no-clear
+ POP
JMP2r
@@ 147,12 149,11 @@ JMP2r
@menu-select-sub ( sub -- )
;get-sub JSR2
+ ;menu-close JSR2
DUP2 #0000 EQU2 ,&skip JCN
- ;menu-close JSR2
- ( run routine ) JSR2 JMP2r
+ DUP2 JSR2
&skip
POP2
- ;menu-close JSR2
JMP2r