more label conflicts fixed

c64/basic/,aliases.s

@@ -53,41 +53,6 @@
 	.label memmove_src = $69
 	.label memmove_dst = $6b
 	.label memmove_size = $6d
-	
-	.label current_file_num = $98
-	.label cassette_buffer_bytes_used = $A6
-	.label load_or_scroll_temp_pointer = $AC
-	// We also use the following for temp colour pointer when scrolling
-	.label load_save_verify_end_address = $AE
-
-	.label current_logical_filenum = $B8
-	.label current_secondary_address = $B9
-	.label current_device_number = $BA
-	.label current_filename_ptr = $BB
-	.label load_save_start_ptr = $C1
-	.label load_save_end_ptr = $C3
-	.label last_key_matrix_position = $C5
-	.label keys_in_key_buffer = $C6
-	.label reverse_video_flag = $C7
-	.label end_of_input_line = $C8
-	.label start_of_keyboard_input = $C9
-	.label current_key_index_entry = $CB
-	.label cursor_blink_disable = $CC
-	.label cursor_blink_countdown = $CD
-	.label cursor_saved_character = $CE
-	.label cursor_is_visible = $CF
-	.label keyboard_input_ready = $D0
-	.label current_screen_line_ptr = $D1
-	.label current_screen_x = $D3
-	.label logical_line_length = $D5
-	.label current_screen_y = $D6
-	.label last_printed_character_ascii = $D7
-	.label insert_mode = $D8
-	// Bits 0 -3 = bits 8-11 of screen line address
-	// Bit 7 = line spans multiple physical lines
-	.label screen_line_link_table = $D9
-	.label current_screen_line_colour_ptr = $F3
-	.label keyboard_decoding_table_ptr = $F5
 
 #if CONFIG_MEMORY_MODEL_60K
 

c64/basic/cmd_load.s

@@ -37,10 +37,10 @@ cmd_load:
 !:
 	// Filename starts here so set pointer
 	lda basic_current_statement_ptr+0
-	sta current_filename_ptr+0
+	sta FNADDR+0
 	lda basic_current_statement_ptr+1
-	sta current_filename_ptr+1
-	
+	sta FNADDR+1
+
 	// Now search for end of line or closing quote
 	// so that we know the length of the filename
 getting_filename:
@@ -60,7 +60,7 @@ got_filename:
 
 	// Now fetch the file number, start from the default one
 	jsr select_device
-	stx current_device_number
+	stx FA
 	jsr injest_comma
 	bcs got_devicenumber
 
@@ -70,20 +70,20 @@ got_filename:
 	jmp do_ILLEGAL_QUANTITY_error
 !:
 	lda basic_line_number+0
-	sta current_device_number
+	sta FA
 
 got_devicenumber:
 
 	// Now fetch the secondary address
 	lda #$00
-	sta current_secondary_address
+	sta SA
 	jsr injest_comma
 	bcs got_secondaryaddress
 	jsr basic_parse_line_number
 	lda basic_line_number+1
 	bne !+
 	lda basic_line_number+0
-	sta current_secondary_address
+	sta SA
 	jmp got_secondaryaddress
 !:
 	// Second parameter is above 255, this can't be a secondary address

c64/basic/select_device.s

@@ -11,7 +11,7 @@ select_device:
 
 	// Note: if tape support is introduced here, make sure DOS wedge won't get broken
 
-	ldx current_device_number
+	ldx FA
 	cpx #$08
 	bcs !+
 	ldx #$08

c64/basic/wedge_dos.s

@@ -74,7 +74,7 @@ wedge_dos_change_drive:
 	bcs !+
 	jmp do_ILLEGAL_DEVICE_NUMBER_error
 !:
-	sta current_device_number
+	sta FA
 	jmp basic_end_of_line
 
 wedge_dos_status_get:
@@ -139,7 +139,7 @@ wedge_dos_directory:
 	// First change the secondary address to the one suitable for
 	// directory loading
 	lda #$00 // logical device number
-	ldx current_device_number
+	ldx FA
 	ldy #$60
 	jsr JSETFLS