diff --git a/xmas_2019/letters.s b/xmas_2019/letters.s index 7c8007a4..fd1fe329 100644 --- a/xmas_2019/letters.s +++ b/xmas_2019/letters.s @@ -3,28 +3,48 @@ .align $100 -letters_bm: - ;.byte 1,12 - .byte "CYCLE",128 - .byte 1+128,12,"CYCLE",128 - .byte 2,16,"COUNTING",128 - .byte 2+128,16,"COUNTING",128 -; .byte 3,12,"M E G A D E M O",150 - .byte 3,16,"MEGADEMO",150 - .byte 1,16," ",128 - .byte 2,16," ",128 - .byte 3,16," ",128 - .byte 1,19,"BY",128 - .byte 3,17,"DEATER",150 - .byte 1,19," ",128 - .byte 3,17," ",128 - .byte 1,17,"MUSIC",128 - .byte 3,17,"DASCON",150 - .byte 1,17," ",128 - .byte 3,17," ",128 - .byte 1,16,"LZ4+DISK",128 - .byte 3,17,"QKUMBA",150 - .byte 1,16," ",128 - .byte 3,17," " - .byte 255 +; MERRY CHRISTMAS +; 2019 +; FROM DEATER +; MUSIC: +; James Lord Pierpont +; michu + +; COOL TREE: +; THEPETSMODE + +; A VMW PRODUCTION +; APPLE ][ FOREVER + +letters_bm: + ;.byte 1, 15, + .byte "MERRY XMAS",128 + .byte 1+128,15,"MERRY XMAS",128 + .byte 3, 15,"FROM DEATER",128 + .byte 3+128,15,"FROM DEATER",150 + .byte 1, 15," ",128 + .byte 1+128,15," ",128 + .byte 3, 15," ",128 + .byte 3+128,15," ",128 + .byte 1, 14,"MUSIC: MICHU",128 + .byte 1+128,14,"MUSIC: MICHU",128 + .byte 3, 21,"J PIERPONT",128 + .byte 3+128,23,"PIERPONT",150 + .byte 1, 14," ",128 + .byte 1+128,14," ",128 + .byte 3, 21," ",128 + .byte 3+128,21," ",128 + .byte 2, 9,"COOL TREE: THEPETSMODE",128 + .byte 2+128,14,"TREE: THEPETSMODE",150 + .byte 2, 9," ",128 + .byte 2+128, 9," ",128 + .byte 1, 12,"A VMW PRODUCTION",128 + .byte 1+128,14,"VMW",150 + .byte 3, 12,"APPLE ][ FOREVER",150 + .byte 3+128,12,"APPLE ][ FOREVER" + .byte 255 + +letters_bm_done: + +.assert >letters_bm = >letters_bm_done, error, "fw_letters crosses page" diff --git a/xmas_2019/move_letters.s b/xmas_2019/move_letters.s index 55dd6688..9c095c93 100644 --- a/xmas_2019/move_letters.s +++ b/xmas_2019/move_letters.s @@ -59,7 +59,7 @@ letter_page0: ; -1 letter_page1: ; asl ; map to memory address ; 2 - nop + and #$7f tay ; 2 lda gr_offsets_l,Y ; lookup low-res memory address ; 4 sta BASL ; store out low byte of addy ; 3 diff --git a/xmas_2019/xmas2019.s b/xmas_2019/xmas2019.s index cc452362..a3157a62 100644 --- a/xmas_2019/xmas2019.s +++ b/xmas_2019/xmas2019.s @@ -164,7 +164,7 @@ snow_init_loop: sta LETTERX lda #1 sta LETTERY - lda #16 + lda #15 sta LETTERD