diff src/menu_processor.asm @ 300:5ad479f2a868

Merged Screen layout mod #1 into Screen layout work #3
author Janos Kovacs <kovjanos@gmail.com>
date Sun, 31 May 2015 21:24:16 +0200
parents 653a3ab08062
children ca32cf2435c6
line wrap: on
line diff
--- a/src/menu_processor.asm	Sun May 31 20:25:12 2015 +0200
+++ b/src/menu_processor.asm	Sun May 31 21:24:16 2015 +0200
@@ -92,7 +92,7 @@
         ; Draw one frame around the divemode menu
         extern  TFT_divemask_color
         call    TFT_divemask_color
-    	WIN_FRAME_COLOR16 divemode_menu_row, divemode_menu_lower, divemode_menu_left ,divemode_menu_right	; top, bottom, left, right
+    	WIN_FRAME_COLOR16 dm_menu_row, dm_menu_lower, dm_menu_left ,dm_menu_right	; top, bottom, left, right
         call    TFT_standard_color
 
         bra     menu_processor1         ; Yes, skip some lines here
@@ -436,9 +436,9 @@
 ;-----------------------------------------------------------------------------
 
 menu_draw_lines_divemode:
-        movlw   divemode_menu_item1_row
+        movlw   dm_menu_item1_row
         movff   WREG,win_top
-        movlw   divemode_menu_item1_column
+        movlw   dm_menu_item1_column
         movff   WREG,win_leftx2
         clrf    start_item
         movff   item_max,menupos4           ; Copy item_max for divemode cursor routine
@@ -578,9 +578,9 @@
         cpfseq  menu_item               ; At pos 4?
         bra     menu_draw_line_none2    ; No
 
-        movlw   divemode_menu_item4_row
+        movlw   dm_menu_item4_row
         movff   WREG,win_top            ; Reset row
-        movlw   divemode_menu_item4_column
+        movlw   dm_menu_item4_column
         movff   WREG,win_leftx2         ; New column
         bra     menu_draw_line_none2    ; Done.