[1.0.0] Add help text for editing prefs

Author: markjfisher

makefiles/custom-atari.mk

@@ -54,10 +54,10 @@ ALTIRRA ?= $(ALTIRRA_HOME)/Altirra64.exe \
   $(XS)/portable $(XS)/portablealt:altirra-debug.ini \
   $(XS)/debug \
   $(XS)/debugcmd: ".loadsym build\$(PROGRAM_TGT).lbl" \
-  $(XS)/debugcmd: "bp kb_global" \
 
+#   $(XS)/debugcmd: "bp kb_global" \
 #   $(XS)/debugcmd: "bp debug" \
-  # $(XS)/debugcmd: "ba w mw_setting_up" \
+#   $(XS)/debugcmd: "ba w mw_setting_up" \
 
 ATARI800 ?= $(ATARI800_HOME)/atari800 \
   -xl -nobasic -ntsc -xl-rev custom -config atari800-debug.cfg -run

src/atari/full/modules/mod_info/mi_edit_preferences.s

@@ -1,18 +1,22 @@
         .export         _mi_edit_preferences
 
         .import         _bar_setcolor
+        .import         _clr_help
         .import         _cng_prefs
         .import         _just_rts
         .import         _kb_get_c_ucase
         .import         _pmg_space_left
         .import         _pmg_space_right
+        .import         _put_help
         .import         _put_s
         .import         _scr_highlight_line
         .import         _write_prefs
         .import         get_scrloc
         .import         hexb
         .import         mi_selected
         .import         mi_set_pmg_widths
+        .import         mx_h1
+        .import         mx_pref_edit_help
         .import         pusha
         .import         temp_num
 
@@ -38,7 +42,7 @@
         jsr     display_pref
         jsr     edit_start
 
-        ; TODO: change the HELP to "up/down edit, return accept, esc exit"
+        put_help   #0, #mx_pref_edit_help
 
         ; now, start a mini keyboard routine that checks for 4 keys, and manipulates the current value
         ; we can use _cng_prefs + mi_selected as the value we are editing, as the screen has same order as the structure.
@@ -123,6 +127,9 @@ not_up:
         jsr     display_pref
         jsr     enact_pref_change       ; reset colours to previous values
         jsr     mi_set_pmg_widths       ; set the widths back to normal
+        jsr     reset_help
+        lda     _cng_prefs + CNG_PREFS_DATA::bar_conn
+        sta     bar_colour
         jmp     change_bar_colour
 
 not_esc:
@@ -143,6 +150,7 @@ not_esc:
         jsr     _write_prefs            ; save them
         jsr     mi_set_pmg_widths       ; set the widths back to normal
 
+        jsr     reset_help
         lda     _cng_prefs + CNG_PREFS_DATA::bar_conn
         sta     bar_colour
         jmp     change_bar_colour
@@ -162,6 +170,12 @@ copy_pref_to_temp:
         sta     pref_copy
         rts
 
+reset_help:
+        jsr     _clr_help
+        pusha   #0
+        setax   #mx_h1
+        jmp     _put_help
+
 .endproc
 
 

src/atari/full/screen/mod_screen_data.s

@@ -1,7 +1,7 @@
         .export mh_s1, mh_s2, mh_h1
         .export md_s1, md_s2, md_h1
         .export mw_s1, mw_s2, mw_h1, mw_h2, mw_help_setup, mw_help_password, mw_custom_msg, mw_help_custom
-        .export mx_s1, mx_s2, mx_h1
+        .export mx_s1, mx_s2, mx_h1, mx_pref_edit_help
         .export mx_k_app_name, mx_v_app_name
         .export mx_k_version, mx_v_version
         .export mx_k_bank_cnt
@@ -37,7 +37,7 @@ mh_s2:
                 NORMAL_CHARMAP
                 .byte $81, $1e, $82
                 INVERT_ATASCII
-                .byte "Info                 Drive Slots"
+                .byte "Prefs                Drive Slots"
                 NORMAL_CHARMAP
                 .byte $81, $1f, $82, 0
 
@@ -91,7 +91,7 @@ mw_s2:
                 NORMAL_CHARMAP
                 .byte $81, $1e, $82
                 INVERT_ATASCII
-                .byte "Drive Slots                 Info"
+                .byte "Drive Slots                Prefs"
                 NORMAL_CHARMAP
                 .byte $81, $1f, $82, 0
 
@@ -155,7 +155,7 @@ mw_custom_msg:
                 .byte "<Custom SSID>", 0
 
 ; ------------------------------------------------------------------
-; Mod DONE data
+; Mod INFO data
 ; ------------------------------------------------------------------
 mx_s1:
                 INVERT_ATASCII
@@ -184,6 +184,19 @@ mx_h1:
                 .byte "Edit ", 0
                 NORMAL_CHARMAP
 
+mx_pref_edit_help:
+                NORMAL_CHARMAP
+                .byte $81, $1c, $1d, $82        ; endL up down endR
+                INVERT_ATASCII
+                .byte "Inc/Dec"
+                NORMAL_CHARMAP
+                .byte $81, "Ret", $82
+                INVERT_ATASCII
+                .byte "Select"
+                NORMAL_CHARMAP
+                .byte $81, "ESC", $82
+                INVERT_ATASCII
+                .byte "Exit", 0
 
 
                 NORMAL_CHARMAP