From 6d5a85c7f73f009157424f31f2b61a4f0a12b5d1 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Tue, 15 Jun 2021 16:00:50 -0400 Subject: [PATCH] hgr: martymations: some optimization --- graphics/hgr/martymation/Makefile | 14 +- graphics/hgr/martymation/marty.s | 16 +- graphics/hgr/martymation/marty_tiny.s | 211 ++++++++++++++++++++++++++ 3 files changed, 231 insertions(+), 10 deletions(-) create mode 100644 graphics/hgr/martymation/marty_tiny.s diff --git a/graphics/hgr/martymation/Makefile b/graphics/hgr/martymation/Makefile index fe1b44ad..60dcd84e 100644 --- a/graphics/hgr/martymation/Makefile +++ b/graphics/hgr/martymation/Makefile @@ -7,10 +7,11 @@ EMPTY_DISK = ../../../empty_disk all: marty.dsk -marty.dsk: HELLO MARTY OREGON +marty.dsk: HELLO MARTY OREGON MARTY_TINY cp $(EMPTY_DISK)/empty.dsk marty.dsk $(DOS33) -y marty.dsk SAVE A HELLO $(DOS33) -y marty.dsk BSAVE -a 0x6000 MARTY + $(DOS33) -y marty.dsk BSAVE -a 0x6000 MARTY_TINY $(DOS33) -y marty.dsk BSAVE -a 0x6000 OREGON ### @@ -28,6 +29,15 @@ marty.o: marty.s ### +MARTY_TINY: marty_tiny.o + ld65 -o MARTY_TINY marty_tiny.o -C $(LINKER_SCRIPTS)/apple2_6000.inc + +marty_tiny.o: marty_tiny.s + ca65 -o marty_tiny.o marty_tiny.s -l marty_tiny.lst + + +### + OREGON: oregon.o ./graphics/new.inc ld65 -o OREGON oregon.o -C $(LINKER_SCRIPTS)/apple2_6000.inc @@ -38,4 +48,4 @@ oregon.o: oregon.s ### clean: - rm -f *~ *.o *.lst HELLO MARTY OREGON + rm -f *~ *.o *.lst HELLO MARTY OREGON MARTY_TINY diff --git a/graphics/hgr/martymation/marty.s b/graphics/hgr/martymation/marty.s index 80b798a3..cc04aaee 100644 --- a/graphics/hgr/martymation/marty.s +++ b/graphics/hgr/martymation/marty.s @@ -135,11 +135,11 @@ label_858a: .byte $00 draw_page: .byte $20 -label_858c: +odd_start: .byte $01 col_start: ; $858d .byte $00 -label_858e: +row_start: ; $858e .byte $00 col_end: ; $858f .byte $28 @@ -151,8 +151,8 @@ row_end: ; $8590 ;============================== cycle_colors: - lda label_858e ; ? - ora label_858c ; ? + lda row_start ; row to start at + ora odd_start ; start at odd or even row? tay row_loop: @@ -171,7 +171,7 @@ col_loop: lda (GBASL),Y ; get current value tax - lda table1,X ; translate with table1 + lda even_table,X ; translate with even column table sta (GBASL),Y iny ; point to next column @@ -188,7 +188,7 @@ col_loop: dont_toggle: tax - lda table2,X ; translate using table2 + lda odd_table,X ; translate using odd column table sta (GBASL),Y ; store out iny ; point to next column @@ -205,7 +205,7 @@ dont_toggle: rts -table1: ; $85d9 ... $86d8 +even_table: ; $85d9 ... $86d8 .byte $55,$56,$57,$54,$59,$5a,$5b,$58, $5d,$5e,$5f,$5c,$51,$52,$53,$50 ; 85d9...85e8 .byte $65,$66,$67,$64,$69,$6a,$6b,$68, $6d,$6e,$6f,$6c,$61,$62,$63,$60 ; .byte $75,$76,$77,$74,$79,$7a,$7b,$78, $7d,$7e,$7f,$7c,$71,$72,$73,$70 ; @@ -225,7 +225,7 @@ table1: ; $85d9 ... $86d8 .byte $85,$86,$87,$84,$89,$8a,$8b,$88, $8d,$8e,$8f,$8c,$81,$82,$83,$80 ; -table2: ; $86d9 ... $87d8 +odd_table: ; $86d9 ... $87d8 .byte $2a,$2b,$2c,$2d,$2e,$2f,$28,$29, $32,$33,$34,$35,$36,$37,$30,$31 ; 86d9...86e8 .byte $3a,$3b,$3c,$3d,$3e,$3f,$38,$39, $22,$23,$24,$25,$26,$27,$20,$21 ; .byte $4a,$4b,$4c,$4d,$4e,$4f,$48,$49, $52,$53,$54,$55,$56,$57,$50,$51 ; diff --git a/graphics/hgr/martymation/marty_tiny.s b/graphics/hgr/martymation/marty_tiny.s new file mode 100644 index 00000000..4c24270d --- /dev/null +++ b/graphics/hgr/martymation/marty_tiny.s @@ -0,0 +1,211 @@ +; Martymation implementation + +; based on the animation routines by +; Martin Kahn found on side B of the Broderbund Color Printshop Disk, Side 2 + +; by Vince `deater` Weaver + +; 6121 bytes -- start +; 6075 bytes -- first pass of optimizing +; 6061 bytes -- remove configurable window +; 5679 bytes -- use HPOSN instead of lookuptable for HGR addresses + +; zero page locations + +NIBCOUNT = $00 + +HGR_BITS = $1C + +GBASL = $26 +GBASH = $27 + +ROW = $82 + +; D0+ used by HGR routines + +HGR_COLOR = $E4 +HGR_PAGE = $E6 + +; soft-switches +KEYPRESS = $C000 +KEYRESET = $C010 +SET_GR = $C050 +FULLGR = $C052 +PAGE1 = $C054 +HIRES = $C057 + +; ROM routines + +HGR2 = $F3D8 ; set hires page2 and clear $4000-$5fff +HGR = $F3E2 ; set hires page1 and clear $2000-$3fff +HPOSN = $F411 ; set GBASL/H to (Y,X),A +HPLOT0 = $F457 ; plot at (Y,X), (A) +HCOLOR1 = $F6F0 ; set HGR_COLOR to value in X +WAIT = $FCA8 ; delay 1/2(26+27A+5A^2) us + + +martymation: + + jsr HGR2 + + ; decompress images + lda #<(page0_lzsa) + sta getsrc_smc+1 + lda #>(page0_lzsa) + sta getsrc_smc+2 + + lda #$20 + + jsr decompress_lzsa2_fast + + lda #<(page1_lzsa) + sta getsrc_smc+1 + lda #>(page1_lzsa) + sta getsrc_smc+2 + + lda #$40 + + jsr decompress_lzsa2_fast + + ;================================ + ; Start Animation + ;================================ +start_animation: + + ldy #$40 ; set draw page to PAGE2 ($4000) + sty draw_page + + ldx #$00 + stx display_page ; set display page to PAGE1 + + inx ; but move it to PAGE2? + +animate_loop: + lda PAGE1,X ; set page + + txa ; switch display page + eor #$01 ; by flipping low bit + tax + + lda draw_page ; switch draw page $4000 <-> $2000 + eor #$60 ; 0100 -> 0010, 0010 -> 0100 + sta draw_page + + stx disp_page2 ; ??????? + + lda #$11 + jsr WAIT ; pause a bit + + ;============================== + ; cycle colors + ;============================== + +cycle_colors: + ldy #1 ; we always start at row1 + +row_loop: + sty ROW ; which ROW we are working on + tya + ldx #0 + ldy #0 + + jsr HPOSN ; put GBASL/H from (Y,X),(A) + + lda GBASH + and #$1f + ora draw_page + sta GBASH + + ldy #0 ; always start column 0 +col_loop: + lda (GBASL),Y ; get current value + tax + + lda even_table,X ; translate with even col table + sta (GBASL),Y + + iny ; point to next column + + asl ; shift color left by two + asl ; this puts bit 6 into carry + + lda (GBASL),Y ; get next column + + bcs dont_toggle ; if bit 6 set, leave next alone + eor #$01 ; otherwise toggle low bit + +dont_toggle: + tax + lda odd_table,X ; translate using odd col table + + sta (GBASL),Y ; store out + iny ; point to next column + + cpy #$28 ; loop until done + bne col_loop + + ldy ROW ; ROW=ROW+2 + iny + iny + + cpy #192 ; see if we are done + bcc row_loop ; if less than, then loop + + ; done inline cycle colors + + ldx disp_page2 ; get which page to display + + jmp animate_loop ; FIXME + + +even_table: ; $85d9 ... $86d8 +.byte $55,$56,$57,$54,$59,$5a,$5b,$58, $5d,$5e,$5f,$5c,$51,$52,$53,$50 ; 85d9...85e8 +.byte $65,$66,$67,$64,$69,$6a,$6b,$68, $6d,$6e,$6f,$6c,$61,$62,$63,$60 ; +.byte $75,$76,$77,$74,$79,$7a,$7b,$78, $7d,$7e,$7f,$7c,$71,$72,$73,$70 ; +.byte $45,$46,$47,$44,$49,$4a,$4b,$48, $4d,$4e,$4f,$4c,$41,$42,$43,$40 ; ...8618 +.byte $15,$16,$17,$14,$19,$1a,$1b,$18, $1d,$1e,$1f,$1c,$11,$12,$13,$10 ; +.byte $25,$26,$27,$24,$29,$2a,$2b,$28, $2d,$2e,$2f,$2c,$21,$22,$23,$20 ; +.byte $35,$36,$37,$34,$39,$3a,$3b,$38, $3d,$3e,$3f,$3c,$31,$32,$33,$30 ; ...8648 +.byte $05,$06,$07,$04,$09,$0a,$0b,$08, $0d,$0e,$0f,$0c,$01,$02,$03,$00 ; + +.byte $d5,$d6,$d7,$d4,$d9,$da,$db,$d8, $dd,$de,$df,$dc,$d1,$d2,$d3,$d0 ; +.byte $e5,$e6,$e7,$e4,$e9,$ea,$eb,$e8, $ed,$ee,$ef,$ec,$e1,$e2,$e3,$e0 ; ...8678 +.byte $f5,$f6,$f7,$f4,$f9,$fa,$fb,$f8, $fd,$fe,$ff,$fc,$f1,$f2,$f3,$f0 ; +.byte $c5,$c6,$c7,$c4,$c9,$ca,$cb,$c8, $cd,$ce,$cf,$cc,$c1,$c2,$c3,$c0 ; +.byte $95,$96,$97,$94,$99,$9a,$9b,$98, $9d,$9e,$9f,$9c,$91,$92,$93,$90 ; +.byte $a5,$a6,$a7,$a4,$a9,$aa,$ab,$a8, $ad,$ae,$af,$ac,$a1,$a2,$a3,$a0 ; ...86b8 +.byte $b5,$b6,$b7,$b4,$b9,$ba,$bb,$b8, $bd,$be,$bf,$bc,$b1,$b2,$b3,$b0 ; +.byte $85,$86,$87,$84,$89,$8a,$8b,$88, $8d,$8e,$8f,$8c,$81,$82,$83,$80 ; + + +odd_table: ; $86d9 ... $87d8 +.byte $2a,$2b,$2c,$2d,$2e,$2f,$28,$29, $32,$33,$34,$35,$36,$37,$30,$31 ; 86d9...86e8 +.byte $3a,$3b,$3c,$3d,$3e,$3f,$38,$39, $22,$23,$24,$25,$26,$27,$20,$21 ; +.byte $4a,$4b,$4c,$4d,$4e,$4f,$48,$49, $52,$53,$54,$55,$56,$57,$50,$51 ; +.byte $5a,$5b,$5c,$5d,$5e,$5f,$58,$59, $42,$43,$44,$45,$46,$47,$40,$41 ; +.byte $6a,$6b,$6c,$6d,$6e,$6f,$68,$69, $72,$73,$74,$75,$76,$77,$70,$71 ; +.byte $7a,$7b,$7c,$7d,$7e,$7f,$78,$79, $62,$63,$64,$65,$66,$67,$60,$61 ; +.byte $0a,$0b,$0c,$0d,$0e,$0f,$08,$09, $12,$13,$14,$15,$16,$17,$10,$11 ; +.byte $1a,$1b,$1c,$1d,$1e,$1f,$18,$19, $02,$03,$04,$05,$06,$07,$00,$01 ; + +.byte $aa,$ab,$ac,$ad,$ae,$af,$a8,$a9, $b2,$b3,$b4,$b5,$b6,$b7,$b0,$b1 ; +.byte $ba,$bb,$bc,$bd,$be,$bf,$b8,$b9, $a2,$a3,$a4,$a5,$a6,$a7,$a0,$a1 ; +.byte $ca,$cb,$cc,$cd,$ce,$cf,$c8,$c9, $d2,$d3,$d4,$d5,$d6,$d7,$d0,$d1 ; +.byte $da,$db,$dc,$dd,$de,$df,$d8,$d9, $c2,$c3,$c4,$c5,$c6,$c7,$c0,$c1 ; +.byte $ea,$eb,$ec,$ed,$ee,$ef,$e8,$e9, $f2,$f3,$f4,$f5,$f6,$f7,$f0,$f1 ; +.byte $fa,$fb,$fc,$fd,$fe,$ff,$f8,$f9, $e2,$e3,$e4,$e5,$e6,$e7,$e0,$e1 ; +.byte $8a,$8b,$8c,$8d,$8e,$8f,$88,$89, $92,$93,$94,$95,$96,$97,$90,$91 ; +.byte $9a,$9b,$9c,$9d,$9e,$9f,$98,$99, $82,$83,$84,$85,$86,$87,$80,$81 ; + +draw_page: + .byte $20 + +display_page: + .byte $00 +disp_page2: + .byte $00 + + +.include "decompress_fast_v2.s" +.include "graphics/asteroid.inc" +