From 070aa30c813755902e2a31b2ad91be2d3210e22c Mon Sep 17 00:00:00 2001 From: Rob McMullen Date: Tue, 25 Jul 2017 17:57:16 -0700 Subject: [PATCH] Added scrolling wipe for thanks screen --- main.s | 2 +- platform-apple2.s | 427 ++++++++++++++++++++++++++++++++++++++++++++++ wipes-demo.s | 4 +- wipes-null.s | 2 +- 4 files changed, 431 insertions(+), 4 deletions(-) diff --git a/main.s b/main.s index ea3a0d8..a28f35f 100644 --- a/main.s +++ b/main.s @@ -173,7 +173,7 @@ initbackground jsr init_damage jsr init_panel jsr titlepage jsr copytexthgr ; page2 becomes the source - jsr titlewipe + jsr fastwipe jsr copy2to1 rts diff --git a/platform-apple2.s b/platform-apple2.s index 962bfed..90ddc1f 100644 --- a/platform-apple2.s +++ b/platform-apple2.s @@ -461,3 +461,430 @@ fasttiles_smc jsr $ffff dec param_count bne fasttiles_row_smc rts + + + +; From Michael Pohoreski's font tutorial +FASTSCROLL_4000_2000_RTS + rts +FASTSCROLL_4000_2000 ; A,X clobbered + ldy #0 +FASTSCROLL_4000_2000_OUTER + cpy #192 + bcs FASTSCROLL_4000_2000_RTS + lda HGRROWS_L,y + sta FASTSCROLL_4000_2000_SMC0+1 + lda HGRROWS_H2,y + sta FASTSCROLL_4000_2000_SMC0+2 + iny + lda HGRROWS_L,y + sta FASTSCROLL_4000_2000_SMC1+1 + lda HGRROWS_H2,y + sta FASTSCROLL_4000_2000_SMC1+2 + iny + lda HGRROWS_L,y + sta FASTSCROLL_4000_2000_SMC2+1 + lda HGRROWS_H2,y + sta FASTSCROLL_4000_2000_SMC2+2 + iny + lda HGRROWS_L,y + sta FASTSCROLL_4000_2000_SMC3+1 + lda HGRROWS_H2,y + sta FASTSCROLL_4000_2000_SMC3+2 + iny + ldx #39 +FASTSCROLL_4000_2000_INNER + lda $3000,x + sta $2000,x + lda $3400,x + sta $2400,x + lda $3800,x + sta $2800,x + lda $3c00,x + sta $2c00,x + lda $2080,x + sta $3000,x + lda $2480,x + sta $3400,x + lda $2880,x + sta $3800,x + lda $2c80,x + sta $3c00,x + lda $3080,x + sta $2080,x + lda $3480,x + sta $2480,x + lda $3880,x + sta $2880,x + lda $3c80,x + sta $2c80,x + lda $2100,x + sta $3080,x + lda $2500,x + sta $3480,x + lda $2900,x + sta $3880,x + lda $2d00,x + sta $3c80,x + lda $3100,x + sta $2100,x + lda $3500,x + sta $2500,x + lda $3900,x + sta $2900,x + lda $3d00,x + sta $2d00,x + lda $2180,x + sta $3100,x + lda $2580,x + sta $3500,x + lda $2980,x + sta $3900,x + lda $2d80,x + sta $3d00,x + lda $3180,x + sta $2180,x + lda $3580,x + sta $2580,x + lda $3980,x + sta $2980,x + lda $3d80,x + sta $2d80,x + lda $2200,x + sta $3180,x + lda $2600,x + sta $3580,x + lda $2a00,x + sta $3980,x + lda $2e00,x + sta $3d80,x + lda $3200,x + sta $2200,x + lda $3600,x + sta $2600,x + lda $3a00,x + sta $2a00,x + lda $3e00,x + sta $2e00,x + lda $2280,x + sta $3200,x + lda $2680,x + sta $3600,x + lda $2a80,x + sta $3a00,x + lda $2e80,x + sta $3e00,x + lda $3280,x + sta $2280,x + lda $3680,x + sta $2680,x + lda $3a80,x + sta $2a80,x + lda $3e80,x + sta $2e80,x + lda $2300,x + sta $3280,x + lda $2700,x + sta $3680,x + lda $2b00,x + sta $3a80,x + lda $2f00,x + sta $3e80,x + lda $3300,x + sta $2300,x + lda $3700,x + sta $2700,x + lda $3b00,x + sta $2b00,x + lda $3f00,x + sta $2f00,x + lda $2380,x + sta $3300,x + lda $2780,x + sta $3700,x + lda $2b80,x + sta $3b00,x + lda $2f80,x + sta $3f00,x + lda $3380,x + sta $2380,x + lda $3780,x + sta $2780,x + lda $3b80,x + sta $2b80,x + lda $3f80,x + sta $2f80,x + lda $2028,x + sta $3380,x + lda $2428,x + sta $3780,x + lda $2828,x + sta $3b80,x + lda $2c28,x + sta $3f80,x + lda $3028,x + sta $2028,x + lda $3428,x + sta $2428,x + lda $3828,x + sta $2828,x + lda $3c28,x + sta $2c28,x + lda $20a8,x + sta $3028,x + lda $24a8,x + sta $3428,x + lda $28a8,x + sta $3828,x + lda $2ca8,x + sta $3c28,x + lda $30a8,x + sta $20a8,x + lda $34a8,x + sta $24a8,x + lda $38a8,x + sta $28a8,x + lda $3ca8,x + sta $2ca8,x + lda $2128,x + sta $30a8,x + lda $2528,x + sta $34a8,x + lda $2928,x + sta $38a8,x + lda $2d28,x + sta $3ca8,x + lda $3128,x + sta $2128,x + lda $3528,x + sta $2528,x + lda $3928,x + sta $2928,x + lda $3d28,x + sta $2d28,x + lda $21a8,x + sta $3128,x + lda $25a8,x + sta $3528,x + lda $29a8,x + sta $3928,x + lda $2da8,x + sta $3d28,x + lda $31a8,x + sta $21a8,x + lda $35a8,x + sta $25a8,x + lda $39a8,x + sta $29a8,x + lda $3da8,x + sta $2da8,x + lda $2228,x + sta $31a8,x + lda $2628,x + sta $35a8,x + lda $2a28,x + sta $39a8,x + lda $2e28,x + sta $3da8,x + lda $3228,x + sta $2228,x + lda $3628,x + sta $2628,x + lda $3a28,x + sta $2a28,x + lda $3e28,x + sta $2e28,x + lda $22a8,x + sta $3228,x + lda $26a8,x + sta $3628,x + lda $2aa8,x + sta $3a28,x + lda $2ea8,x + sta $3e28,x + lda $32a8,x + sta $22a8,x + lda $36a8,x + sta $26a8,x + lda $3aa8,x + sta $2aa8,x + lda $3ea8,x + sta $2ea8,x + lda $2328,x + sta $32a8,x + lda $2728,x + sta $36a8,x + lda $2b28,x + sta $3aa8,x + lda $2f28,x + sta $3ea8,x + lda $3328,x + sta $2328,x + lda $3728,x + sta $2728,x + lda $3b28,x + sta $2b28,x + lda $3f28,x + sta $2f28,x + lda $23a8,x + sta $3328,x + lda $27a8,x + sta $3728,x + lda $2ba8,x + sta $3b28,x + lda $2fa8,x + sta $3f28,x + lda $33a8,x + sta $23a8,x + lda $37a8,x + sta $27a8,x + lda $3ba8,x + sta $2ba8,x + lda $3fa8,x + sta $2fa8,x + lda $2050,x + sta $33a8,x + lda $2450,x + sta $37a8,x + lda $2850,x + sta $3ba8,x + lda $2c50,x + sta $3fa8,x + lda $3050,x + sta $2050,x + lda $3450,x + sta $2450,x + lda $3850,x + sta $2850,x + lda $3c50,x + sta $2c50,x + lda $20d0,x + sta $3050,x + lda $24d0,x + sta $3450,x + lda $28d0,x + sta $3850,x + lda $2cd0,x + sta $3c50,x + lda $30d0,x + sta $20d0,x + lda $34d0,x + sta $24d0,x + lda $38d0,x + sta $28d0,x + lda $3cd0,x + sta $2cd0,x + lda $2150,x + sta $30d0,x + lda $2550,x + sta $34d0,x + lda $2950,x + sta $38d0,x + lda $2d50,x + sta $3cd0,x + lda $3150,x + sta $2150,x + lda $3550,x + sta $2550,x + lda $3950,x + sta $2950,x + lda $3d50,x + sta $2d50,x + lda $21d0,x + sta $3150,x + lda $25d0,x + sta $3550,x + lda $29d0,x + sta $3950,x + lda $2dd0,x + sta $3d50,x + lda $31d0,x + sta $21d0,x + lda $35d0,x + sta $25d0,x + lda $39d0,x + sta $29d0,x + lda $3dd0,x + sta $2dd0,x + lda $2250,x + sta $31d0,x + lda $2650,x + sta $35d0,x + lda $2a50,x + sta $39d0,x + lda $2e50,x + sta $3dd0,x + lda $3250,x + sta $2250,x + lda $3650,x + sta $2650,x + lda $3a50,x + sta $2a50,x + lda $3e50,x + sta $2e50,x + lda $22d0,x + sta $3250,x + lda $26d0,x + sta $3650,x + lda $2ad0,x + sta $3a50,x + lda $2ed0,x + sta $3e50,x + lda $32d0,x + sta $22d0,x + lda $36d0,x + sta $26d0,x + lda $3ad0,x + sta $2ad0,x + lda $3ed0,x + sta $2ed0,x + lda $2350,x + sta $32d0,x + lda $2750,x + sta $36d0,x + lda $2b50,x + sta $3ad0,x + lda $2f50,x + sta $3ed0,x + lda $3350,x + sta $2350,x + lda $3750,x + sta $2750,x + lda $3b50,x + sta $2b50,x + lda $3f50,x + sta $2f50,x + lda $23d0,x + sta $3350,x + lda $27d0,x + sta $3750,x + lda $2bd0,x + sta $3b50,x + lda $2fd0,x + sta $3f50,x + lda $33d0,x + sta $23d0,x + lda $37d0,x + sta $27d0,x + lda $3bd0,x + sta $2bd0,x + lda $3fd0,x + sta $2fd0,x +FASTSCROLL_4000_2000_SMC0 + lda $ffff,x + sta $33d0,x +FASTSCROLL_4000_2000_SMC1 + lda $ffff,x + sta $37d0,x +FASTSCROLL_4000_2000_SMC2 + lda $ffff,x + sta $3bd0,x +FASTSCROLL_4000_2000_SMC3 + lda $ffff,x + sta $3fd0,x + dex + bmi FASTSCROLL_4000_2000_NEXT_OUTER + + jmp FASTSCROLL_4000_2000_INNER +FASTSCROLL_4000_2000_NEXT_OUTER + jmp FASTSCROLL_4000_2000_OUTER diff --git a/wipes-demo.s b/wipes-demo.s index 24bdda8..bdf8b03 100644 --- a/wipes-demo.s +++ b/wipes-demo.s @@ -1,4 +1,4 @@ -titlepage jsr titlewipe +titlepage jsr FASTSCROLL_4000_2000 jsr wait jsr wait jsr wait @@ -11,6 +11,6 @@ titlepage jsr titlewipe jsr wait rts -titlewipe jsr wipeclear1 +fastwipe jsr wipeclear1 jsr wipe2to1 ; copy hidden title page rts diff --git a/wipes-null.s b/wipes-null.s index f4535b4..5e123d2 100644 --- a/wipes-null.s +++ b/wipes-null.s @@ -1,3 +1,3 @@ titlepage rts -titlewipe rts +fastwipe rts