reduced amount of VICE label conflicts

c64/kernal/scnkey.s

@@ -74,9 +74,9 @@ SCNKEY:
 	sta BufferQuantity
 
 	// Decrement key repeat timeout if non-zero
-	ldx key_repeat_counter
+	ldx KOUNT
 	beq sk_start
-	dec key_repeat_counter
+	dec KOUNT
 	
 sk_start:	
 	// Call main keyboard scanning routine
@@ -110,7 +110,7 @@ accept_key:
 	// Convert matrix position to key code
 	// XXX - Add offset of $40, $80 or $C0 if shift, CONTROL or C= are held down
 	pha
-	lda key_bucky_state
+	lda SHFLAG
 	and #$7
 	tax
 	pla
@@ -123,9 +123,9 @@ accept_key:
 
 	// Stash key into keyboard buffer
 	ldx keys_in_key_buffer
-	cpx key_buffer_size
+	cpx XMAX
 	beq sk_nokey
-	sta keyboard_buffer,x
+	sta KEYD,x
 	inc keys_in_key_buffer
 	
 sk_nokey:	
@@ -204,10 +204,10 @@ ReturnNoKeys:
 NoActivityDetected:
 
 	// So cancel all bucky keys
-	lda key_bucky_state
-	sta key_last_bucky_state
+	lda SHFLAG
+	sta LSTSHF
 	lda #$00
-	sta key_bucky_state
+	sta SHFLAG
 	
 	jmp ReturnNoKeys
 
@@ -239,7 +239,7 @@ JoystickActivity:
 
 	// Clear bucky key status
 	lda #$00
-	sta key_bucky_state
+	sta SHFLAG
 	
 	lda $dc01
 	and #$03
@@ -254,7 +254,7 @@ JoystickActivity:
 	// Up
 	// Mark shift as pressed
 	ldx #$01
-	stx key_bucky_state
+	stx SHFLAG
 	ldx #$07		// UP/DOWN
 	jsr KeyFound
 !:
@@ -278,7 +278,7 @@ JoystickActivity:
 	cmp #$08
 	bne !+
 	ldx #$01
-	stx key_bucky_state
+	stx SHFLAG
 	ldx #$02
 	jsr KeyFound		// LEFT/RIGHT
 !:
@@ -332,20 +332,20 @@ next_row:
 
 	// Store de-bounce data for bucky keys
 	// (Compute's Mapping the 64, p58-59)
-	lda key_bucky_state
-	sta key_last_bucky_state
+	lda SHFLAG
+	sta LSTSHF
 
 	// Build bucky state
 	lda #$00
-	sta key_bucky_state
+	sta SHFLAG
 	lda ScanResult+6
 	eor #%10000000
 	and #%10000000     // Left shift
 	rol
 	rol
 	and #$01
-	ora key_bucky_state
-	sta key_bucky_state
+	ora SHFLAG
+	sta SHFLAG
 
 	// Right shift
 	lda ScanResult+1
@@ -355,15 +355,15 @@ next_row:
 	lsr
 	lsr
 	and #$01
-	ora key_bucky_state
-	sta key_bucky_state
+	ora SHFLAG
+	sta SHFLAG
 	
 	// Control
 	lda ScanResult+0
 	eor #$04
 	and #$04
-	ora key_bucky_state
-	sta key_bucky_state
+	ora SHFLAG
+	sta SHFLAG
 
 	// Vendor key
 	lda ScanResult+0
@@ -373,17 +373,17 @@ next_row:
 	lsr
 	lsr
 	and #$02
-	ora key_bucky_state
-	sta key_bucky_state
+	ora SHFLAG
+	sta SHFLAG
 
 	// Chick for shift + Vendor
 	cmp #$03
 	bne no_case_toggle
-	lda key_last_bucky_state
+	lda LSTSHF
 	cmp #$03
 	beq no_case_toggle
 
-	lda enable_case_switch
+	lda MODE
 	beq no_case_toggle
 	
 	lda $D018
@@ -509,15 +509,15 @@ KeyHeld:
 	// Different key held
 	sta last_key_matrix_position
 	pha
-	lda key_first_repeat_delay
-	sta key_repeat_counter
+	lda DELAY
+	sta KOUNT
 	pla
 BuckyHeld:
 	jmp ConsiderNextKey
 	
 SameKeyHeld:
 	pha
-	lda key_repeat_counter
+	lda KOUNT
 	bmi KeyCanRepeat
 	bne KeyRepeatWait
 	// Count down ended, so repeat key now
@@ -526,7 +526,7 @@ KeyCanRepeat:
 	// (Compute's Mapping the 64 p58)
 	pha
 	lda #6-2  		// Fudge factor to match speed
-	sta key_repeat_counter
+	sta KOUNT
 	pla
 	pla