reduced amount of VICE label conflicts

c64/basic/,aliases.s

@@ -60,7 +60,6 @@
 	// We also use the following for temp colour pointer when scrolling
 	.label load_save_verify_end_address = $AE
 
-	.label cassette_buffer_ptr = $B2
 	.label current_logical_filenum = $B8
 	.label current_secondary_address = $B9
 	.label current_device_number = $BA
@@ -80,7 +79,6 @@
 	.label keyboard_input_ready = $D0
 	.label current_screen_line_ptr = $D1
 	.label current_screen_x = $D3
-	.label quote_mode_flag = $D4
 	.label logical_line_length = $D5
 	.label current_screen_y = $D6
 	.label last_printed_character_ascii = $D7
@@ -91,28 +89,6 @@
 	.label current_screen_line_colour_ptr = $F3
 	.label keyboard_decoding_table_ptr = $F5
 
-	.label basic_input_buffer = BUF
-
-	// "Compute's Mapping the 64" book
-	.label keyboard_buffer = $0277
-	.label text_colour = $0286 // p55
-	.label colour_under_cursor = $0287 // p56
-	.label key_buffer_size = $0289 // p57
-
-	// 0 = cursor keys, insert, delete and space repeat, but nothing else
-	// 128 = all keys repeat
-	// 64 = no keys repeat
-	.label key_repeat_flags = $028A // p58
-	// https://www.c64-wiki.com/wiki/Page_2
-	.label key_repeat_counter = $028B
-	.label key_first_repeat_delay = $028C
-	// bit 0 = shift, 1 = Vendor Key, 2 = Control
-	.label key_bucky_state = $028D
-	.label key_last_bucky_state = $028E
-	.label keyboard_decoding_ptr = $028F
-	.label enable_case_switch = $0291
-	.label screen_scroll_disable = $0292
-
 #if CONFIG_MEMORY_MODEL_60K
 
 	// BASIC uses some extra bytes for memory access under ROMs located at $2A7 onwards

c64/basic/basic_main_loop.s

@@ -24,7 +24,7 @@ read_line_loop:
 	ldx #22
 	jmp basic_do_error
 !:
-	sta basic_input_buffer,x
+	sta BUF,x
 	inx
 	jmp read_line_loop
 

c64/basic/cmd_list.s

@@ -66,7 +66,7 @@ list_single_line: // entry point needed by DOS wedge
 	// Iterate through printing out the line
 	// contents
 	lda #0
-	sta quote_mode_flag
+	sta QTSW
 	
 	ldy #4
 list_print_loop:	
@@ -82,14 +82,14 @@ list_print_loop:
 	beq list_end_of_line
 	cmp #$22
 	bne list_not_quote
-	lda quote_mode_flag
+	lda QTSW
 	eor #$ff
-	sta quote_mode_flag
+	sta QTSW
 	lda #$22
 	jmp list_is_literal
 list_not_quote:	
 	// Check quote mode, and display as literal if required
-	ldx quote_mode_flag
+	ldx QTSW
 	bne list_is_literal
 	
 	cmp #$7f
@@ -128,7 +128,7 @@ list_not_quote:
 	// REM command locks quote flag on until the end of the line, allowing
 	// funny characters in REM statements without problem.
 	inc $0427
-	sta quote_mode_flag 	// Any value other than $00 or $FF will lock quote mode on, so the token value of REM is fine here
+	sta QTSW    // Any value other than $00 or $FF will lock quote mode on, so the token value of REM is fine here
 	// FALL THROUGH
 list_not_rem:		
 	

c64/basic/tokenise_line.s

@@ -17,7 +17,7 @@ tokenise_line:
 	lda #$00
 	sta $0110
 	sta $0112
-	sta quote_mode_flag
+	sta QTSW
 	
 	lda tokenise_work1
 	sta $0113
@@ -40,7 +40,7 @@ tokenise_char:
 
 	// Clear quote mode flag that is also used by KERNAL for screen display
 	lda #$00
-	sta quote_mode_flag
+	sta QTSW
 	rts
 !:
 	// More to do
@@ -60,9 +60,9 @@ tokenise_char_loop:
 	bne tk_not_quote
 
 	// Quote
-	lda quote_mode_flag
+	lda QTSW
 	eor #$ff
-	sta quote_mode_flag
+	sta QTSW
 	jmp tk_literal_char
 	
 tk_not_quote:
@@ -82,7 +82,7 @@ tk_not_quote:
 
 tk_might_be_keyword:	
 	// Don't tokenise in quote mode
-	lda quote_mode_flag
+	lda QTSW
 	bne tk_literal_char
 	
 	// Pack string
@@ -137,9 +137,9 @@ found_token_in_line:
 	// If it is REM, then lock us in quote mode to the end of the line
 	cmp #$8f
 	bne not_rem
-	sta quote_mode_flag
-not_rem:	
-	
+	sta QTSW
+not_rem:
+
 	// Now skip over the length of the token
 	lda $0110
 	clc