From c534cf4b3e4145b6af437e4d00a594f481386b3f Mon Sep 17 00:00:00 2001
From: Vince Weaver <vincent.weaver@maine.edu>
Date: Thu, 14 Dec 2017 15:59:54 -0500
Subject: [PATCH] mode7: update scroller to use compressed files

---
 mode7/deater_scroll.inc |  19 ++-
 mode7/mode7.dsk         | Bin 143360 -> 143360 bytes
 mode7/mode7.s           |   8 -
 mode7/scroll_demo.s     | 354 +++++++++++++++++++++++++++++++++++++++-
 mode7/scroller.c        | 110 ++++++++++---
 mode7/utils.s           |   8 +
 6 files changed, 446 insertions(+), 53 deletions(-)

diff --git a/mode7/deater_scroll.inc b/mode7/deater_scroll.inc
index 681498ba..c234891b 100644
--- a/mode7/deater_scroll.inc
+++ b/mode7/deater_scroll.inc
@@ -1,9 +1,10 @@
-scroll_length: .byte 167
-scroll_row1:
-	.byte $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$20,$20,$00,$00,$00,$20,$20,$20,$20,$00,$00,$20,$20,$00,$00,$20,$20,$20,$00,$20,$20,$20,$20,$00,$20,$20,$20,$00,$00,$00,$00,$00,$00,$00,$40,$00,$00,$00,$40,$00,$00,$40,$40,$00,$00,$00,$40,$40,$40,$00,$00,$00,$00,$00,$00,$10,$00,$00,$10,$00,$10,$10,$10,$10,$00,$10,$10,$10,$00,$00,$10,$10,$10,$10,$00,$10,$10,$10,$00,$10,$10,$10,$00,$10,$10,$10,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-scroll_row2:
-	.byte $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$E6,$00,$06,$E0,$00,$E6,$00,$00,$00,$00,$E6,$00,$00,$E6,$00,$00,$E6,$00,$00,$E6,$00,$00,$00,$00,$E6,$00,$00,$E6,$00,$00,$00,$00,$00,$00,$DC,$00,$00,$00,$DC,$00,$DC,$00,$00,$DC,$00,$DC,$00,$00,$00,$00,$00,$00,$00,$00,$00,$B3,$00,$00,$B3,$00,$B3,$00,$00,$00,$00,$B3,$00,$00,$B3,$00,$B3,$00,$00,$00,$00,$03,$B3,$03,$00,$03,$B3,$03,$00,$03,$B3,$03,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-scroll_row3:
-	.byte $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$EF,$00,$00,$EF,$00,$EF,$0F,$0F,$00,$00,$EF,$0F,$0F,$EF,$00,$00,$EF,$00,$00,$EF,$0F,$0F,$00,$00,$EF,$0F,$0F,$E0,$00,$00,$00,$00,$00,$00,$DF,$00,$D0,$00,$DF,$00,$DF,$0F,$0F,$DF,$00,$00,$0F,$0F,$D0,$00,$00,$00,$00,$00,$00,$BF,$0F,$0F,$BF,$00,$BF,$0F,$0F,$00,$00,$BF,$0F,$0F,$B0,$00,$BF,$0F,$0F,$00,$00,$00,$0F,$00,$00,$00,$0F,$00,$00,$00,$0F,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-scroll_row4:
-	.byte $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$26,$20,$06,$00,$00,$26,$20,$20,$20,$00,$26,$00,$00,$26,$00,$00,$26,$00,$00,$26,$20,$20,$20,$00,$26,$00,$00,$26,$00,$00,$00,$00,$00,$00,$4C,$0C,$00,$0C,$4C,$00,$4C,$00,$00,$4C,$00,$40,$40,$40,$0C,$00,$00,$00,$00,$00,$00,$13,$00,$00,$13,$00,$13,$10,$10,$10,$00,$13,$00,$00,$13,$00,$13,$10,$10,$10,$00,$00,$13,$00,$00,$00,$13,$00,$00,$00,$13,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
+; Original size = 668 bytes
+deater_scroll:
+; scroll_length:
+.byte 167
+	.byte $A0,$28,$00,$20,$20,$A3,$00,$A4,$20,$00,$00,$20,$20,$00,$00,$A3,$20,$00,$A4,$20,$00,$A3,$20,$A7,$00,$40,$A3,$00,$40,$00,$00,$40,$40,$A3,$00,$A3,$40,$A6,$00,$10,$00,$00,$10,$00,$A4,$10,$00,$A3,$10,$00,$00,$A4,$10,$00,$A3,$10,$00,$A3,$10,$00,$A3,$10,$A0,$82,$00
+	.byte $A0,$28,$00,$E6,$00,$06,$E0,$00,$E6,$A4,$00,$E6,$00,$00,$E6,$00,$00,$E6,$00,$00,$E6,$A4,$00,$E6,$00,$00,$E6,$A6,$00,$DC,$A3,$00,$DC,$00,$DC,$00,$00,$DC,$00,$DC,$A9,$00,$B3,$00,$00,$B3,$00,$B3,$A4,$00,$B3,$00,$00,$B3,$00,$B3,$A4,$00,$03,$B3,$03,$00,$03,$B3,$03,$00,$03,$B3,$03,$A0,$82,$00
+	.byte $A0,$28,$00,$EF,$00,$00,$EF,$00,$EF,$0F,$0F,$00,$00,$EF,$0F,$0F,$EF,$00,$00,$EF,$00,$00,$EF,$0F,$0F,$00,$00,$EF,$0F,$0F,$E0,$A6,$00,$DF,$00,$D0,$00,$DF,$00,$DF,$0F,$0F,$DF,$00,$00,$0F,$0F,$D0,$A6,$00,$BF,$0F,$0F,$BF,$00,$BF,$0F,$0F,$00,$00,$BF,$0F,$0F,$B0,$00,$BF,$0F,$0F,$A3,$00,$0F,$A3,$00,$0F,$A3,$00,$0F,$A0,$83,$00
+	.byte $A0,$28,$00,$26,$20,$06,$00,$00,$26,$A3,$20,$00,$26,$00,$00,$26,$00,$00,$26,$00,$00,$26,$A3,$20,$00,$26,$00,$00,$26,$A6,$00,$4C,$0C,$00,$0C,$4C,$00,$4C,$00,$00,$4C,$00,$A3,$40,$0C,$A6,$00,$13,$00,$00,$13,$00,$13,$A3,$10,$00,$13,$00,$00,$13,$00,$13,$A3,$10,$00,$00,$13,$A3,$00,$13,$A3,$00,$13,$A0,$83,$00
+	.byte $A1
+; Compressed size = 294 bytes
diff --git a/mode7/mode7.dsk b/mode7/mode7.dsk
index 8f692df3c892105e1b7e37ffe8cf69d78ae527e1..0a0a9d0ce7871cd537a0359d7f136e5b6d2de889 100644
GIT binary patch
delta 17011
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

delta 15219
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

diff --git a/mode7/mode7.s b/mode7/mode7.s
index 8d520b32..ac2c99ba 100644
--- a/mode7/mode7.s
+++ b/mode7/mode7.s
@@ -1104,14 +1104,6 @@ exit:
 ; Variables
 ;===============================================
 
-	; waste memory with a lookup table
-	; move this to the zeropage?
-
-gr_offsets:
-	.word	$400,$480,$500,$580,$600,$680,$700,$780
-	.word 	$428,$4a8,$528,$5a8,$628,$6a8,$728,$7a8
-	.word	$450,$4d0,$550,$5d0,$650,$6d0,$750,$7d0
-
 .if .def(ISLAND_MAP)
 .include "island_map.inc"
 .endif
diff --git a/mode7/scroll_demo.s b/mode7/scroll_demo.s
index 43cfcd05..bdd0c1d0 100644
--- a/mode7/scroll_demo.s
+++ b/mode7/scroll_demo.s
@@ -1,6 +1,13 @@
 .include "zp.inc"
 
 
+scroll_row1	EQU     $8A00
+scroll_row2	EQU	$8B00
+scroll_row3	EQU	$8C00
+scroll_row4	EQU	$8D00
+
+SCROLL_LENGTH	EQU	$E6
+
 	;================================
 	; Clear screen and setup graphics
 	;================================
@@ -15,6 +22,16 @@
 	sta	DISP_PAGE
 	sta	ANGLE
 
+	;=======================
+	; decompress scroll text
+	;=======================
+	lda	#>deater_scroll
+	sta	INH
+	lda	#<deater_scroll
+	sta	INL
+	jsr	decompress_scroll
+
+
 scroll_loop:
 
 	ldx	#0
@@ -83,7 +100,7 @@ sm4:
 	clc
 	lda	ANGLE
 	adc	#40
-	cmp	scroll_length
+	cmp	SCROLL_LENGTH
 	bne	blah
 	lda	#0
 	sta	ANGLE
@@ -93,11 +110,88 @@ blah:
 	inc	ANGLE
 	jmp	scroll_loop						; 3
 
-;===============================================
-; External modules
-;===============================================
 
-.include "utils.s"
+
+	;=======================
+	; decompress scroll
+	;=======================
+decompress_scroll:
+	ldy	#0
+	jsr	load_and_increment
+	sta	SCROLL_LENGTH
+
+	lda	#<scroll_row1
+	sta	OUTL
+	lda	#>scroll_row1
+	sta	OUTH
+
+decompress_scroll_loop:
+	jsr	load_and_increment	; load compressed value
+
+	cmp	#$A1			; EOF marker
+	beq	done_decompress_scroll	; if EOF, exit
+
+	pha				; save
+
+	and	#$f0			; mask
+	cmp	#$a0			; see if special AX
+	beq	decompress_special
+
+	pla				; note, PLA sets flags!
+
+	ldx	#$1			; only want to print 1
+	bne	decompress_run
+
+decompress_special:
+	pla
+
+	and	#$0f			; check if was A0
+
+	bne	decompress_color	; if A0 need to read run, color
+
+decompress_large:
+	jsr	load_and_increment	; get run length
+
+decompress_color:
+	tax				; put runlen into X
+	jsr	load_and_increment	; get color
+
+decompress_run:
+	sta	(OUTL),Y
+	pha
+
+	clc				; increment 16-bit pointer
+	lda	OUTL
+	adc	#$1
+	sta	OUTL
+	lda	OUTH
+	adc	#$0
+	sta	OUTH
+
+	pla
+
+	dex				; repeat for X times
+	bne	decompress_run
+
+	beq	decompress_scroll_loop	; get next run
+
+done_decompress_scroll:
+	rts
+
+
+load_and_increment:
+	lda	(INL),Y			; load and increment 16-bit pointer
+	pha
+	clc
+	lda	INL
+	adc	#$1
+	sta	INL
+	lda	INH
+	adc	#$0
+	sta	INH
+	pla
+	rts
+
 
 ;===============================================
 ; Variables
@@ -105,11 +199,253 @@ blah:
 
 .include "deater_scroll.inc"
 
-	; waste memory with a lookup table
-	; move this to the zeropage?
+;=====================================================================
+;= ROUTINES
+;=====================================================================
 
+
+clear_screens:
+	;===================================
+	; Clear top/bottom of page 0
+	;===================================
+
+	lda     #$0
+	sta     DRAW_PAGE
+	jsr     clear_top
+	jsr     clear_bottom
+
+	;===================================
+	; Clear top/bottom of page 1
+	;===================================
+
+	lda     #$4
+	sta     DRAW_PAGE
+	jsr     clear_top
+	jsr     clear_bottom
+
+	rts
+
+	;==========
+	; page_flip
+	;==========
+
+page_flip:
+;	lda	$c019		; wait for vertical refresh
+;	bmi	page_flip
+
+	lda	DISP_PAGE						; 3
+	beq	page_flip_show_1					; 2nt/3
+page_flip_show_0:
+        bit	PAGE0							; 4
+	lda	#4							; 2
+	sta	DRAW_PAGE	; DRAW_PAGE=1				; 3
+	lda	#0							; 2
+	sta	DISP_PAGE	; DISP_PAGE=0				; 3
+	rts								; 6
+page_flip_show_1:
+	bit	PAGE1							; 4
+	sta	DRAW_PAGE	; DRAW_PAGE=0				; 3
+	lda	#1							; 2
+	sta	DISP_PAGE	; DISP_PAGE=1				; 3
+	rts								; 6
+							;====================
+							; DISP_PAGE=0 	26
+							; DISP_PAGE=1	24
+
+
+
+	;==========================================================
+	; set_gr_page0
+	;==========================================================
+	;
+set_gr_page0:
+	;lda	#4
+	;sta	GR_PAGE
+	bit	PAGE0			; set page 0
+	bit	LORES			; Lo-res graphics
+	bit	TEXTGR			; mixed gr/text mode
+	bit	SET_GR			; set graphics
+	rts
+
+
+
+	;================================
+	; hlin_setup
+	;================================
+	; put address in GBASL/GBASH
+	; Ycoord in A, Xcoord in Y
+hlin_setup:
+	sty	TEMPY							; 3
+	tay			; y=A					; 2
+	lda	gr_offsets,Y	; lookup low-res memory address		; 4
+	clc								; 2
+	adc	TEMPY							; 3
+	sta	GBASL							; 3
+	iny								; 2
+
+	lda	gr_offsets,Y						; 4
+	adc	DRAW_PAGE	; add in draw page offset		; 3
+	sta	GBASH							; 3
+	rts								; 6
+								;===========
+								;	35
+	;================================
+	; hlin_double:
+	;================================
+	; HLIN Y, V2 AT A
+	; Y, X, A trashed
+	; start at Y, draw up to and including X
+hlin_double:
+;int hlin_double(int page, int x1, int x2, int at) {
+
+	jsr	hlin_setup						; 41
+
+	sec								; 2
+	lda	V2							; 3
+	sbc	TEMPY							; 3
+
+	tax								; 2
+	inx								; 2
+								;===========
+								;	53
+	; fallthrough
+
+	;=================================
+	; hlin_double_continue:  width
+	;=================================
+	; width in X
+
+hlin_double_continue:
+
+	ldy	#0							; 2
+	lda	COLOR							; 3
+hlin_double_loop:
+	sta	(GBASL),Y						; 6
+	inc	GBASL							; 5
+	dex								; 2
+	bne	hlin_double_loop					; 2nt/3
+
+	rts								; 6
+								;=============
+								; 53+5+X*16+5
+
+	;================================
+	; hlin_single:
+	;================================
+	; HLIN Y, V2 AT A
+	; Y, X, A trashed
+hlin_single:
+
+	jsr	hlin_setup
+
+	sec
+	lda	V2
+	sbc	TEMPY
+
+	tax
+
+	; fallthrough
+
+	;=================================
+	; hlin_single_continue:  width
+	;=================================
+	; width in X
+
+hlin_single_continue:
+
+hlin_single_top:
+	lda	COLOR
+	and	#$f0
+	sta	COLOR
+
+hlin_single_top_loop:
+	ldy	#0
+	lda	(GBASL),Y
+	and	#$0f
+	ora	COLOR
+	sta	(GBASL),Y
+	inc	GBASL
+	dex
+	bne	hlin_single_top_loop
+
+	rts
+
+hlin_single_bottom:
+
+	lda	COLOR
+	and	#$0f
+	sta	COLOR
+
+hlin_single_bottom_loop:
+	ldy	#0
+	lda	(GBASL),Y
+	and	#$f0
+	sta	(GBASL),Y
+	inc	GBASL
+	dex
+	bne	hlin_single_bottom_loop
+
+	rts
+
+
+	;=============================
+	; clear_top
+	;=============================
+clear_top:
+	lda	#$00
+
+	;=============================
+	; clear_top_a
+	;=============================
+clear_top_a:
+
+	sta	COLOR
+
+	; VLIN Y, V2 AT A
+
+	lda	#40
+	sta	V2
+
+	lda	#0
+
+clear_top_loop:
+	ldy	#0
+	pha
+
+	jsr	hlin_double
+
+	pla
+	clc
+	adc	#$2
+	cmp	#40
+	bne	clear_top_loop
+
+	rts
+
+clear_bottom:
+	lda	#$a0	; NORMAL space
+	sta	COLOR
+
+	lda	#40
+	sta	V2
+
+clear_bottom_loop:
+	ldy	#0
+	pha
+
+	jsr	hlin_double
+
+	pla
+	clc
+	adc	#$2
+	cmp	#48
+	bne	clear_bottom_loop
+
+	rts
+
+
+	; move these to zero page for slight speed increase?
 gr_offsets:
 	.word	$400,$480,$500,$580,$600,$680,$700,$780
-	.word 	$428,$4a8,$528,$5a8,$628,$6a8,$728,$7a8
+	.word	$428,$4a8,$528,$5a8,$628,$6a8,$728,$7a8
 	.word	$450,$4d0,$550,$5d0,$650,$6d0,$750,$7d0
-
diff --git a/mode7/scroller.c b/mode7/scroller.c
index bd62dbcd..5a4be403 100644
--- a/mode7/scroller.c
+++ b/mode7/scroller.c
@@ -1,6 +1,5 @@
-/* Use grey2 to make RLE more efficient? */
-
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 static unsigned char font[256][9]={
@@ -286,51 +285,90 @@ static int color_map[4][8]={
 };
 
 
+static int runlen[4]={0,0,0,0},last_color[4]={0,0,0,0};
+static int new_size=0;
+
+static unsigned char row[4][256];
+
+static int rle_compress(int color, int j) {
+
+	int need_comma=0;
+
+	if (color==last_color[j]) {
+		runlen[j]++;
+	}
+	else {
+//		printf("Run of color %d length %d\n",
+//			last_color[j],runlen[j]);
+		if (runlen[j]==0) ; // first color, skip
+		if (runlen[j]==1) {
+			printf("$%02X",last_color[j]);
+			new_size++;
+		}
+		if (runlen[j]==2) {
+			printf("$%02X,$%02X",last_color[j],last_color[j]);
+			new_size+=2;
+		}
+
+		if ((runlen[j]>2) && (runlen[j]<16)) {
+			printf("$%02X,$%02X",0xa0 | (runlen[j]),
+				last_color[j]);
+			new_size+=2;
+		}
+		/* We could in theory compress up to 272 */
+		/* but we leave it at 256 to make the decode easier */
+		if ((runlen[j]>15) && (runlen[j]<256)) {
+			new_size+=3;
+			printf("$%02X,$%02X,$%02X",0xa0,
+				runlen[j],last_color[j]);
+		}
+		if (runlen[j]>256) {
+			printf("Too big!\n");
+			exit(1);
+		}
+
+		runlen[j]=1;
+		need_comma=1;
+	}
+	return need_comma;
+}
+
 int main(int argc, char **argv) {
 
 	//char string[]="ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
 	char string[]="        \001DEATER \002WAS \003HERE!!!        ";
-	int length=0,width=0,x,y,i;
+	int length=0,width=0,x,y,i,j;
 	int color,color1,color2;
 	int which_color=0;
-
-	unsigned char row[4][256];
+	int need_comma;
 
 	for(i=0;i<strlen(string);i++) {
 		if (string[i]<5) { which_color=string[i]-1; continue;}
 
 		width=font[(int)string[i]][0];
 		for(x=0;x<width;x++) {
-			color=!!(font[(int)string[i]][1]&(0x80>>x));
-			color1=color?color_map[which_color][0]:0;
-			color=!!(font[(int)string[i]][2]&(0x80>>x));
-			color2=color?(color_map[which_color][1])<<4:0;
-			row[0][length]=color1|color2;
+			for(j=0;j<4;j++) {
+				color=!!(font[(int)string[i]][1+j*2]&(0x80>>x));
+				color1=color?color_map[which_color][0+j*2]:0;
+				color=!!(font[(int)string[i]][2+j*2]&(0x80>>x));
+				color2=color?(color_map[which_color][1+j*2])<<4:0;
+				color=color1|color2;
+				row[j][length]=color;
 
-			color=!!(font[(int)string[i]][3]&(0x80>>x));
-			color1=color?color_map[which_color][2]:0;
-			color=!!(font[(int)string[i]][4]&(0x80>>x));
-			color2=color?(color_map[which_color][3])<<4:0;
-			row[1][length]=color1|color2;
-
-			color=!!(font[(int)string[i]][5]&(0x80>>x));
-			color1=color?color_map[which_color][4]:0;
-			color=!!(font[(int)string[i]][6]&(0x80>>x));
-			color2=color?(color_map[which_color][5])<<4:0;
-			row[2][length]=color1|color2;
-
-			color=!!(font[(int)string[i]][7]&(0x80>>x));
-			color1=color?color_map[which_color][6]:0;
-			color=!!(font[(int)string[i]][8]&(0x80>>x));
-			color2=color?(color_map[which_color][7])<<4:0;
-			row[3][length]=color1|color2;
+				if (color1==0xa) {
+					printf("Error!  Can't use grey2!\n");
+					exit(0);
+				}
 
+			}
 
 			length++;
 		}
 	}
 
+	printf("; Original size = %d bytes\n",length*4);
 
+#if 0
 	printf("scroll_length: .byte %d\n",length);
 	for(y=0;y<4;y++) {
 		printf("scroll_row%d:\n",y+1);
@@ -341,6 +379,24 @@ int main(int argc, char **argv) {
 		}
 		printf("\n");
 	}
+#endif
+	printf("deater_scroll:\n");
+	printf("; scroll_length:\n.byte %d\n",length);
+	for(y=0;y<4;y++) {
+		//printf("scroll_row%d:\n",y+1);
+		printf("\t.byte ");
+		for(x=0;x<256;x++) {
+			need_comma=rle_compress(row[y][x],y);
+			if ((need_comma) && (x!=length-1)) printf(",");
+			last_color[y]=row[y][x];
+		}
+		rle_compress(-1,y);
+		printf("\n");
+	}
+	printf("\t.byte $A1\n");
+	new_size++;
+	printf("; Compressed size = %d bytes\n",new_size);
+
 
 	return 0;
 }
diff --git a/mode7/utils.s b/mode7/utils.s
index 328c2a8e..f45c0b5d 100644
--- a/mode7/utils.s
+++ b/mode7/utils.s
@@ -542,3 +542,11 @@ clear_bottom_loop:
 	bne	clear_bottom_loop
 
 	rts
+
+
+	; move these to zero page for slight speed increase?
+gr_offsets:
+	.word	$400,$480,$500,$580,$600,$680,$700,$780
+	.word	$428,$4a8,$528,$5a8,$628,$6a8,$728,$7a8
+	.word	$450,$4d0,$550,$5d0,$650,$6d0,$750,$7d0
+