From dd337cda46b9aa161e6ef116c0e177d92a630918 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Fri, 6 Mar 2020 15:19:35 -0500 Subject: [PATCH] mist: split common sprites to own file --- mist/Makefile | 1 + mist/common_sprites.inc | 33 +++++++++++++++++++++++++++++++++ mist/mist.s | 30 +----------------------------- mist/mist_title.s | 1 - 4 files changed, 35 insertions(+), 30 deletions(-) create mode 100644 mist/common_sprites.inc diff --git a/mist/Makefile b/mist/Makefile index fd3a26be..110e09a8 100644 --- a/mist/Makefile +++ b/mist/Makefile @@ -47,6 +47,7 @@ MIST: mist.o mist.o: mist.s zp.inc hardware.inc \ graphics_island/mist_graphics.inc \ + common_sprites.inc \ gr_copy.s audio.s text_print.s decompress_fast_v2.s ca65 -o mist.o mist.s -l mist.lst diff --git a/mist/common_sprites.inc b/mist/common_sprites.inc new file mode 100644 index 00000000..c21651de --- /dev/null +++ b/mist/common_sprites.inc @@ -0,0 +1,33 @@ + + +finger_point_sprite: + .byte 5,5 + .byte $AA,$BB,$AA,$AA,$AA + .byte $AA,$BB,$AA,$AA,$AA + .byte $BA,$BB,$BB,$BB,$BB + .byte $AB,$BB,$BB,$BB,$BB + .byte $AA,$BB,$BB,$BB,$AA + +finger_grab_sprite: + .byte 5,5 + .byte $AA,$AA,$BB,$AA,$AA + .byte $BB,$AA,$BB,$AA,$BB + .byte $BB,$BA,$BB,$BA,$BB + .byte $AB,$BB,$BB,$BB,$BB + .byte $AA,$BB,$BB,$BB,$AA + +finger_left_sprite: + .byte 6,4 + .byte $AA,$AA,$AA,$AB,$BA,$AA + .byte $BB,$BB,$BB,$BB,$BB,$BB + .byte $AA,$AA,$BB,$BB,$BB,$BB + .byte $AA,$AA,$AB,$BB,$BB,$AB + +finger_right_sprite: + .byte 6,4 + .byte $AA,$BA,$AB,$AA,$AA,$AA + .byte $BB,$BB,$BB,$BB,$BB,$BB + .byte $BA,$BB,$BB,$BB,$AA,$AA + .byte $AB,$BB,$BB,$AB,$AA,$AA + + diff --git a/mist/mist.s b/mist/mist.s index 5849fcbd..5723199e 100644 --- a/mist/mist.s +++ b/mist/mist.s @@ -747,35 +747,7 @@ red_book_done: .include "graphics_island/mist_graphics.inc" -finger_point_sprite: - .byte 5,5 - .byte $AA,$BB,$AA,$AA,$AA - .byte $AA,$BB,$AA,$AA,$AA - .byte $BA,$BB,$BB,$BB,$BB - .byte $AB,$BB,$BB,$BB,$BB - .byte $AA,$BB,$BB,$BB,$AA - -finger_grab_sprite: - .byte 5,5 - .byte $AA,$AA,$BB,$AA,$AA - .byte $BB,$AA,$BB,$AA,$BB - .byte $BB,$BA,$BB,$BA,$BB - .byte $AB,$BB,$BB,$BB,$BB - .byte $AA,$BB,$BB,$BB,$AA - -finger_left_sprite: - .byte 6,4 - .byte $AA,$AA,$AA,$AB,$BA,$AA - .byte $BB,$BB,$BB,$BB,$BB,$BB - .byte $AA,$AA,$BB,$BB,$BB,$BB - .byte $AA,$AA,$AB,$BB,$BB,$AB - -finger_right_sprite: - .byte 6,4 - .byte $AA,$BA,$AB,$AA,$AA,$AA - .byte $BB,$BB,$BB,$BB,$BB,$BB - .byte $BA,$BB,$BB,$BB,$AA,$AA - .byte $AB,$BB,$BB,$AB,$AA,$AA + .include "common_sprites.inc" diff --git a/mist/mist_title.s b/mist/mist_title.s index f9024169..5bc8f0ee 100644 --- a/mist/mist_title.s +++ b/mist/mist_title.s @@ -29,7 +29,6 @@ reload_everything: lda #file - sta LZ4_SRC+1 sta LZSA_SRC_HI lda #$20