reorganized extended BASIC tokens

src/basic/print/list_single_line.s

@@ -104,13 +104,11 @@ list_not_quote:
 	; Check for extended BASIC tokens
 	cmp #$01
 	beq list_display_token_01
-!ifndef HAS_SMALL_BASIC {
-	cmp #$02
-	beq list_display_token_02
-}
 !ifdef CONFIG_MB_M65 {
-	cmp #$03
-	beq list_display_token_03
+	cmp #$04
+	beq list_display_token_04
+	cmp #$06
+	beq list_display_token_06
 }
 
 	; Check for literals
@@ -232,37 +230,34 @@ list_display_token_ext_done:
 	; Next iteration
 	+bra list_not_rem
 
-!ifndef HAS_SMALL_BASIC {
-
-list_display_token_02:
-
-	; Display a 2-byte token - for extended BASIC
-	jsr list_fetch_subtoken
-
-	; Check if token is known
-	cpx #TK__MAXTOKEN_keywords_02
-	bcs list_is_unknown
-
-	; Now ask for it to be printed
-	+phy_trash_a
-	jsr print_packed_keyword_02
-	+bra list_display_token_ext_done
-}
-
 !ifdef CONFIG_MB_M65 {
 
-list_display_token_03:
+list_display_token_04:
 
 	; Display a 2-byte token - for extended BASIC
 	jsr list_fetch_subtoken
 
 	; Check if token is known
-	cpx #TK__MAXTOKEN_keywords_03
+	cpx #TK__MAXTOKEN_keywords_04
 	bcs list_is_unknown
 
 	; Now ask for it to be printed
 	+phy_trash_a
-	jsr print_packed_keyword_03
+	jsr print_packed_keyword_04
+	+bra list_display_token_ext_done
+
+list_display_token_06:
+
+	; Display a 2-byte token - for extended BASIC
+	jsr list_fetch_subtoken
+
+	; Check if token is known
+	cpx #TK__MAXTOKEN_keywords_06
+	bcs list_is_unknown
+
+	; Now ask for it to be printed
+	+phy_trash_a
+	jsr print_packed_keyword_06
 	+bra list_display_token_ext_done
 }
 

src/basic/print/print_packed_freq_string.s

@@ -59,21 +59,18 @@ print_packed_keyword_01:               ; .X - token number
 	ldy #>packed_freq_keywords_01
 	bne print_freq_packed_string       ; branch always
 
-!ifndef HAS_SMALL_BASIC {
-
-print_packed_keyword_02:               ; .X - token number
-
-	lda #<packed_freq_keywords_02
-	ldy #>packed_freq_keywords_02
-	bne print_freq_packed_string       ; branch always
-}
-
 !ifdef CONFIG_MB_M65 {
 
-print_packed_keyword_03:               ; .X - token number
+print_packed_keyword_04:               ; .X - token number
 
-	lda #<packed_freq_keywords_03
-	ldy #>packed_freq_keywords_03
+	lda #<packed_freq_keywords_04
+	ldy #>packed_freq_keywords_04
+	bne print_freq_packed_string       ; branch always
+
+print_packed_keyword_06:               ; .X - token number
+
+	lda #<packed_freq_keywords_06
+	ldy #>packed_freq_keywords_06
 	bne print_freq_packed_string       ; branch always
 }