megademo: waterfall: merge back in re-rolled erase loop

megademo/Makefile

@@ -36,7 +36,7 @@ megademo.o:	megademo.s \
 	leaving.s leaving.inc tfv_sprites.inc \
 	arrival.s arrival.inc \
 	bird_mountain.s letters.s \
-	waterfall.s gr_unrolled_copy.s waterfall_page1.inc waterfall_page2.inc \
+	waterfall.s waterfall_page1.inc waterfall_page2.inc \
 	takeoff.s takeoff.inc takeoff.img.lz4 \
 	mode7.s \
 	space_bars.s text_print.s \

megademo/gr_unrolled_copy.s

@@ -1,35 +0,0 @@
-	;=========================================================
-	; fast copy rows 22-36 from $C00 to $400
-	;=========================================================
-	;
-	; 7+ 8*[9*7 + 7] + 5 = 572
-
-gr_copy_row22:
-	ldy	#8							; 2
-	ldx	XPOS							; 3
-	dex								; 2
-grcr_loop:
-	lda	$da8,x							; 4
-	sta	$5a8,x		; 22					; 5
-	lda	$e28,x							; 4
-	sta	$628,x		; 24					; 5
-	lda	$ea8,x							; 4
-	sta	$6a8,x		; 26					; 5
-	lda	$f28,x							; 4
-	sta	$728,x		; 28					; 5
-	lda	$fa8,x							; 4
-	sta	$7a8,x		; 30					; 5
-	lda	$c50,x							; 4
-	sta	$450,x		; 32					; 5
-	lda	$cd0,x							; 4
-	sta	$4d0,x		; 34					; 5
-
-	inx								; 2
-	dey								; 2
-	bne	grcr_loop						; 3
-									; -1
-	rts								; 6
-
-
-
-

megademo/waterfall.s

@@ -328,8 +328,43 @@ adjust_xpos:
 
 
 
-.align	$100
+
-.include "gr_unrolled_copy.s"
+	;=========================================================
+	; fast copy rows 22-36 from $C00 to $400
+	;=========================================================
+	;
+	; 7+ 8*[9*7 + 7] + 5 = 572
+
+gr_copy_row22:
+	ldy	#8							; 2
+	ldx	XPOS							; 3
+	dex								; 2
+grcr_loop:
+	lda	$da8,x							; 4
+	sta	$5a8,x		; 22					; 5
+	lda	$e28,x							; 4
+	sta	$628,x		; 24					; 5
+	lda	$ea8,x							; 4
+	sta	$6a8,x		; 26					; 5
+	lda	$f28,x							; 4
+	sta	$728,x		; 28					; 5
+	lda	$fa8,x							; 4
+	sta	$7a8,x		; 30					; 5
+	lda	$c50,x							; 4
+	sta	$450,x		; 32					; 5
+	lda	$cd0,x							; 4
+	sta	$4d0,x		; 34					; 5
+
+	inx								; 2
+	dey								; 2
+	bne	grcr_loop						; 3
+									; -1
+	rts								; 6
+
+
+
+
+
 
 
 ;		even	odd     three   four