mirror of
https://github.com/deater/dos33fsprogs.git
synced 2024-12-27 17:29:49 +00:00
xmas24: fix scroll wrapping
This commit is contained in:
Vince Weaver
parent
1bc69bdb78
commit
f7735598a5
48
demos/xmas_2024/font/Makefile
Normal file
48
demos/xmas_2024/font/Makefile
Normal file
@ -0,0 +1,48 @@
|
||||
|
||||
HGR_SPRITE = ../../../utils/hgr-utils/hgr_make_sprite
|
||||
HGR_LARGEFONT = ../../../utils/hgr-utils/png2largefont
|
||||
|
||||
all: font.inc large_font.inc
|
||||
|
||||
large_font.inc: a2_big_font.png
|
||||
$(HGR_LARGEFONT) -r a2_big_font.png > large_font.inc
|
||||
|
||||
font.inc: a2_big_font.png
|
||||
$(HGR_SPRITE) -l font_space a2_big_font.png 0 0 13 16 > font.inc
|
||||
$(HGR_SPRITE) -l font_A a2_big_font.png 14 0 27 16 >> font.inc
|
||||
$(HGR_SPRITE) -l font_B a2_big_font.png 28 0 41 16 >> font.inc
|
||||
$(HGR_SPRITE) -l font_C a2_big_font.png 42 0 55 16 >> font.inc
|
||||
$(HGR_SPRITE) -l font_D a2_big_font.png 56 0 69 16 >> font.inc
|
||||
$(HGR_SPRITE) -l font_E a2_big_font.png 70 0 83 16 >> font.inc
|
||||
$(HGR_SPRITE) -l font_F a2_big_font.png 84 0 97 16 >> font.inc
|
||||
$(HGR_SPRITE) -l font_G a2_big_font.png 98 0 111 16 >> font.inc
|
||||
$(HGR_SPRITE) -l font_H a2_big_font.png 112 0 125 16 >> font.inc
|
||||
$(HGR_SPRITE) -l font_I a2_big_font.png 126 0 139 16 >> font.inc
|
||||
$(HGR_SPRITE) -l font_J a2_big_font.png 140 0 153 16 >> font.inc
|
||||
$(HGR_SPRITE) -l font_K a2_big_font.png 154 0 167 16 >> font.inc
|
||||
$(HGR_SPRITE) -l font_L a2_big_font.png 168 0 181 16 >> font.inc
|
||||
$(HGR_SPRITE) -l font_M a2_big_font.png 182 0 195 16 >> font.inc
|
||||
$(HGR_SPRITE) -l font_N a2_big_font.png 196 0 209 16 >> font.inc
|
||||
$(HGR_SPRITE) -l font_O a2_big_font.png 210 0 223 16 >> font.inc
|
||||
$(HGR_SPRITE) -l font_P a2_big_font.png 0 18 13 34 >> font.inc
|
||||
$(HGR_SPRITE) -l font_Q a2_big_font.png 14 18 27 34 >> font.inc
|
||||
$(HGR_SPRITE) -l font_R a2_big_font.png 28 18 41 34 >> font.inc
|
||||
$(HGR_SPRITE) -l font_S a2_big_font.png 42 18 55 34 >> font.inc
|
||||
$(HGR_SPRITE) -l font_T a2_big_font.png 56 18 69 34 >> font.inc
|
||||
$(HGR_SPRITE) -l font_U a2_big_font.png 70 18 83 34 >> font.inc
|
||||
$(HGR_SPRITE) -l font_V a2_big_font.png 84 18 97 34 >> font.inc
|
||||
$(HGR_SPRITE) -l font_W a2_big_font.png 98 18 111 34 >> font.inc
|
||||
$(HGR_SPRITE) -l font_X a2_big_font.png 112 18 125 34 >> font.inc
|
||||
$(HGR_SPRITE) -l font_Y a2_big_font.png 126 18 139 34 >> font.inc
|
||||
$(HGR_SPRITE) -l font_Z a2_big_font.png 140 18 153 34 >> font.inc
|
||||
$(HGR_SPRITE) -l font_PERIOD a2_big_font.png 154 18 167 34 >> font.inc
|
||||
$(HGR_SPRITE) -l font_SHORA1 a2_big_font.png 168 18 181 34 >> font.inc
|
||||
$(HGR_SPRITE) -l font_SHORA2 a2_big_font.png 182 18 195 34 >> font.inc
|
||||
$(HGR_SPRITE) -l font_SHORA3 a2_big_font.png 196 18 209 34 >> font.inc
|
||||
$(HGR_SPRITE) -l font_SHORA4 a2_big_font.png 210 18 223 34 >> font.inc
|
||||
|
||||
|
||||
|
||||
clean:
|
||||
rm -f *~ \
|
||||
font.inc large_font.inc
|
||||
BIN
demos/xmas_2024/font/a2_big_font.png
Normal file
BIN
demos/xmas_2024/font/a2_big_font.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.7 KiB |
425
demos/xmas_2024/horiz_scroll.s
Normal file
425
demos/xmas_2024/horiz_scroll.s
Normal file
@ -0,0 +1,425 @@
|
||||
;============================
|
||||
; do the pan
|
||||
|
||||
do_scroll:
|
||||
|
||||
pan_loop:
|
||||
|
||||
lda #0
|
||||
sta SCROLL_SUBSCROLL
|
||||
sta SCROLL_OFFSET
|
||||
|
||||
; set up first char
|
||||
jsr draw_font_char
|
||||
|
||||
pan_outer_outer_loop:
|
||||
|
||||
; 168->184
|
||||
ldx #183 ; work backwards, 184->168
|
||||
pan_outer_loop:
|
||||
|
||||
; setup the high bytes in the SMC
|
||||
|
||||
; $2000 ; 0010 -> 0100 0011 -> 0101
|
||||
lda hposn_high,X
|
||||
; pha
|
||||
clc
|
||||
adc DRAW_PAGE
|
||||
sta pil_smc2+2 ; lda
|
||||
sta pil_smc12+2 ; lda
|
||||
sta pil_smc22+2 ; lda
|
||||
sta pil_smc6+2 ; lda
|
||||
eor #$60
|
||||
sta pil_smc1+2 ; sta
|
||||
sta pil_smc3+2 ; sta
|
||||
sta pil_smc13+2 ; sta
|
||||
sta pil_smc23+2 ; sta
|
||||
|
||||
|
||||
; $6000
|
||||
|
||||
; this is always $60 when compact
|
||||
; in theory don't even need to self modify
|
||||
|
||||
; pla
|
||||
; clc
|
||||
; adc #$40
|
||||
|
||||
lda #$60
|
||||
|
||||
sta pil_smc5+2 ; lda
|
||||
sta pil_smc7+2 ; sta
|
||||
sta pil_smc8+2 ; sta
|
||||
sta pil_smc9+2 ; sta
|
||||
|
||||
; setup the low address bytes in the SMC
|
||||
|
||||
; $2000
|
||||
lda hposn_low,X
|
||||
sta pil_smc1+1
|
||||
sta pil_smc2+1
|
||||
sta pil_smc12+1
|
||||
sta pil_smc22+1
|
||||
sta pil_smc6+1
|
||||
|
||||
; $6000 even
|
||||
pha
|
||||
txa
|
||||
lda compact_even-168,X
|
||||
sta pil_smc5+1
|
||||
sta pil_smc8+1
|
||||
pla
|
||||
|
||||
; $2000+1
|
||||
clc
|
||||
adc #1
|
||||
sta pil_smc3+1
|
||||
sta pil_smc13+1
|
||||
sta pil_smc23+1
|
||||
|
||||
; $6000+1
|
||||
lda compact_odd-168,X
|
||||
sta pil_smc7+1
|
||||
sta pil_smc9+1
|
||||
|
||||
stx XSAVE
|
||||
|
||||
; inner loop
|
||||
|
||||
; original: 6+(30*39)-1 = 1175
|
||||
; new 6+(24*39)-1 = 941
|
||||
; unroll by 3 6+((19+19+19+5)*13)-1 = 811
|
||||
|
||||
ldy #0 ; start col0 ; 2
|
||||
pil_smc1:
|
||||
ldx $2000,Y ; even col ; 4+
|
||||
|
||||
;===================================
|
||||
; loop1
|
||||
|
||||
pan_inner_loop:
|
||||
|
||||
; X from previous loop
|
||||
|
||||
lda left_lookup_main,X ; lookup next ; 4+
|
||||
|
||||
pil_smc3:
|
||||
ldx $2000+1,Y ; odd col ; 4+
|
||||
ora left_lookup_next,X ; 4+
|
||||
|
||||
pil_smc2:
|
||||
sta $2000,Y ; update ; 5
|
||||
|
||||
iny ; 2
|
||||
|
||||
;===================================
|
||||
; loop2
|
||||
|
||||
;pan_inner_loop:
|
||||
|
||||
; X from previous loop
|
||||
|
||||
lda left_lookup_main,X ; lookup next ; 4+
|
||||
|
||||
pil_smc13:
|
||||
ldx $2000+1,Y ; odd col ; 4+
|
||||
ora left_lookup_next,X ; 4+
|
||||
|
||||
pil_smc12:
|
||||
sta $2000,Y ; update ; 5
|
||||
|
||||
iny ; 2
|
||||
|
||||
;===================================
|
||||
; loop3
|
||||
|
||||
;pan_inner_loop:
|
||||
|
||||
; X from previous loop
|
||||
|
||||
lda left_lookup_main,X ; lookup next ; 4+
|
||||
|
||||
pil_smc23:
|
||||
ldx $2000+1,Y ; odd col ; 4+
|
||||
ora left_lookup_next,X ; 4+
|
||||
|
||||
pil_smc22:
|
||||
sta $2000,Y ; update ; 5
|
||||
|
||||
iny ; 2
|
||||
cpy #39 ; 2
|
||||
bne pan_inner_loop ; 2/3
|
||||
|
||||
;==================================
|
||||
; leftover
|
||||
;==================================
|
||||
|
||||
; X has $2000,39
|
||||
lda left_lookup_main,X ; 4+
|
||||
|
||||
pil_smc5:
|
||||
ldx $6000 ; 4+
|
||||
ora left_lookup_next,X ; 4+
|
||||
|
||||
pil_smc6:
|
||||
sta $2000,Y ; 5
|
||||
|
||||
;=================
|
||||
; shift font
|
||||
; X has $6000
|
||||
lda left_lookup_main,X ; 4+
|
||||
|
||||
pil_smc7:
|
||||
ldx $6000+1 ; 4+
|
||||
ora left_lookup_next,X ; 4+
|
||||
|
||||
pil_smc8:
|
||||
sta $6000 ; 5
|
||||
|
||||
lda left_lookup_main,X ; 4+
|
||||
pil_smc9:
|
||||
sta $6000+1 ; 5
|
||||
|
||||
|
||||
; $2038 $2039 $4000 $4001
|
||||
;0 DCCBBAA GGFFEED KJJIIHH NNMMLLK
|
||||
;1 EDDCCBB HHGGFFE LKKJJII ~~NNMML
|
||||
;2 FEEDDCC IIHHGGF MLLKKJJ ~~~~NNM
|
||||
;3 GFFEEDD JJIIHHG NMMLLKK ~~~~~~N
|
||||
;4 HGGFFEE KKJJIIH ~NNMMLL ~~~~~~~
|
||||
;5 IHHGGFF LLKKJJI ~~~NNMM ~~~~~~~
|
||||
;6 JIIHHGG MMLLKKJ ~~~~~NN ~~~~~~~
|
||||
;7 KJJIIHH NNMMLLK ~~~~~~~ ~~~~~~~
|
||||
;8 RQQPPOO UUTTSSR
|
||||
|
||||
; every 7 clicks need to copy over two more columns
|
||||
|
||||
ldx XSAVE
|
||||
|
||||
dex
|
||||
cpx #167 ; check to see if done
|
||||
; copying rows
|
||||
beq done_pan_outer_loop
|
||||
jmp pan_outer_loop
|
||||
done_pan_outer_loop:
|
||||
|
||||
lda KEYPRESS ; if keypress early exit
|
||||
bmi done_pan
|
||||
|
||||
; wrap subscroll counter
|
||||
; TODO: use mod 7 table here
|
||||
inc SCROLL_SUBSCROLL
|
||||
lda SCROLL_SUBSCROLL
|
||||
cmp #7
|
||||
bne no_ticker
|
||||
|
||||
next_letter:
|
||||
lda #0
|
||||
sta SCROLL_SUBSCROLL
|
||||
|
||||
jsr draw_font_char
|
||||
|
||||
|
||||
no_ticker:
|
||||
|
||||
jsr wait_vblank
|
||||
jsr hgr_page_flip
|
||||
|
||||
lda SCROLL_OFFSET
|
||||
cmp #137
|
||||
beq done_pan
|
||||
|
||||
jmp pan_outer_outer_loop
|
||||
|
||||
done_pan:
|
||||
bit KEYRESET
|
||||
|
||||
lda #0
|
||||
sta SCROLL_OFFSET
|
||||
|
||||
rts
|
||||
|
||||
.include "scroll_tables.s"
|
||||
|
||||
|
||||
|
||||
|
||||
draw_font_char:
|
||||
|
||||
|
||||
;do_scroll:
|
||||
; lda #0
|
||||
; sta SCROLL_START
|
||||
; sta SCROLL_ODD
|
||||
|
||||
|
||||
do_scroll_loop:
|
||||
ldx SCROLL_OFFSET ; load offset into string
|
||||
lda scroll_text,X ; get the character
|
||||
sec
|
||||
sbc #'@' ; convert from ASCII
|
||||
asl
|
||||
tax
|
||||
|
||||
draw_text_page3:
|
||||
; row1
|
||||
lda large_font_row0,X
|
||||
; sta $62D0
|
||||
sta $6000
|
||||
lda large_font_row0+1,X
|
||||
; sta $62D1
|
||||
sta $6001
|
||||
|
||||
; row2
|
||||
lda large_font_row1,X
|
||||
; sta $66D0
|
||||
sta $6002
|
||||
lda large_font_row1+1,X
|
||||
; sta $66D1
|
||||
sta $6003
|
||||
|
||||
; row3
|
||||
lda large_font_row2,X
|
||||
; sta $6AD0
|
||||
sta $6004
|
||||
lda large_font_row2+1,X
|
||||
; sta $6AD1
|
||||
sta $6005
|
||||
|
||||
; row4
|
||||
lda large_font_row3,X
|
||||
; sta $6ED0
|
||||
sta $6006
|
||||
lda large_font_row3+1,X
|
||||
; sta $6ED1
|
||||
sta $6007
|
||||
|
||||
; row5
|
||||
lda large_font_row4,X
|
||||
; sta $72D0
|
||||
sta $6008
|
||||
lda large_font_row4+1,X
|
||||
; sta $72D1
|
||||
sta $6009
|
||||
|
||||
; row6
|
||||
lda large_font_row5,X
|
||||
; sta $76D0
|
||||
sta $600A
|
||||
lda large_font_row5+1,X
|
||||
; sta $76D1
|
||||
sta $600B
|
||||
|
||||
; row7
|
||||
lda large_font_row6,X
|
||||
; sta $7AD0
|
||||
sta $600C
|
||||
lda large_font_row6+1,X
|
||||
; sta $7AD1
|
||||
sta $600D
|
||||
|
||||
; row8
|
||||
lda large_font_row7,X
|
||||
; sta $7ED0
|
||||
sta $600E
|
||||
lda large_font_row7+1,X
|
||||
; sta $7ED1
|
||||
sta $600F
|
||||
|
||||
; row9
|
||||
lda large_font_row8,X
|
||||
; sta $6350
|
||||
sta $6010
|
||||
lda large_font_row8+1,X
|
||||
; sta $6351
|
||||
sta $6011
|
||||
|
||||
; row10
|
||||
lda large_font_row9,X
|
||||
; sta $6750
|
||||
sta $6012
|
||||
lda large_font_row9+1,X
|
||||
; sta $6751
|
||||
sta $6013
|
||||
|
||||
; row11
|
||||
lda large_font_row10,X
|
||||
; sta $6B50
|
||||
sta $6014
|
||||
lda large_font_row10+1,X
|
||||
; sta $6B51
|
||||
sta $6015
|
||||
|
||||
; row12
|
||||
lda large_font_row11,X
|
||||
; sta $6F50
|
||||
sta $6016
|
||||
lda large_font_row11+1,X
|
||||
; sta $6F51
|
||||
sta $6017
|
||||
|
||||
; row13
|
||||
lda large_font_row12,X
|
||||
; sta $7350
|
||||
sta $6018
|
||||
lda large_font_row12+1,X
|
||||
; sta $7351
|
||||
sta $6019
|
||||
|
||||
; row14
|
||||
lda large_font_row13,X
|
||||
; sta $7750
|
||||
sta $601A
|
||||
lda large_font_row13+1,X
|
||||
; sta $7751
|
||||
sta $601B
|
||||
|
||||
; row15
|
||||
lda large_font_row14,X
|
||||
; sta $7B50
|
||||
sta $601c
|
||||
lda large_font_row14+1,X
|
||||
; sta $7B51
|
||||
sta $601d
|
||||
|
||||
; row16
|
||||
lda large_font_row15,X
|
||||
; sta $7F50
|
||||
sta $601E
|
||||
lda large_font_row15+1,X
|
||||
; sta $7F51
|
||||
sta $601F
|
||||
|
||||
inc SCROLL_OFFSET ; point to next char
|
||||
|
||||
rts
|
||||
|
||||
scroll_text:
|
||||
; ]^_
|
||||
;0123456789012345678901234567890123456789
|
||||
.byte "@\@\@MERRY@CHRISTMAS@FROM@MAINE@]^"
|
||||
.byte "@]^@FROM@THE@GUINEA@PIG@GANG@" ; 63
|
||||
.byte "]^@\@]^@\@BEST@WISHES@FOR@A@GREAT@WINTER@\@\@\" ; 111
|
||||
.byte "]^@\@]^@@@@@@@@@@@@@@@@@@@@" ; 137
|
||||
|
||||
|
||||
|
||||
|
||||
; offscreen text draw
|
||||
|
||||
; original compact
|
||||
; 1 62D0,62D1 6000,6001
|
||||
; 2 66D0,66D1 6002,6003
|
||||
; 3 6AD0,6AD1 6004,6005
|
||||
; 4 6AE0,6AE1 6006,6007
|
||||
; 5 72D0,72D1 6008,6009
|
||||
; 6 76D0,76D1 600A,600B
|
||||
; 7 7AD0,7AD1 600C,600D
|
||||
|
||||
compact_even:
|
||||
.byte $00,$02,$04,$06,$08,$0A,$0c,$0e
|
||||
.byte $10,$12,$14,$16,$18,$1A,$1c,$1e
|
||||
|
||||
compact_odd:
|
||||
.byte $01,$03,$05,$07,$09,$0B,$0D,$0F
|
||||
.byte $11,$13,$15,$17,$19,$1B,$1D,$1F
|
||||
@ -56,9 +56,11 @@ xmas_main:
|
||||
|
||||
cli
|
||||
|
||||
repeat:
|
||||
|
||||
jsr do_scroll
|
||||
|
||||
repeat:
|
||||
|
||||
|
||||
finished:
|
||||
jmp repeat
|
||||
|
||||
Loading…
Reference in New Issue
Block a user