From 3e8762f4b6653f9f11d227b42d6cb4367545a2ec Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Fri, 22 May 2020 16:10:45 -0400 Subject: [PATCH] mist: can get to the blue page in selenetic now --- mist/common_defines.inc | 4 +- mist/graphics_selena/Makefile | 14 ++++- mist/graphics_selena/water_note_e.png | Bin 0 -> 1222 bytes mist/graphics_selena/water_note_s.png | Bin 0 -> 1253 bytes mist/graphics_selena/water_note_w.png | Bin 0 -> 1199 bytes mist/graphics_selena/water_path_e.png | Bin 0 -> 996 bytes mist/graphics_selena/water_path_w.png | Bin 0 -> 1104 bytes mist/graphics_selena/water_turn_n.png | Bin 0 -> 937 bytes mist/graphics_selena/water_turn_s.png | Bin 0 -> 907 bytes mist/graphics_selena/water_turn_w.png | Bin 0 -> 928 bytes mist/leveldata_selena.inc | 63 ++++++++++++++++++- mist/selena.s | 83 +++++++++++++++++++++++++- 12 files changed, 155 insertions(+), 9 deletions(-) create mode 100644 mist/graphics_selena/water_note_e.png create mode 100644 mist/graphics_selena/water_note_s.png create mode 100644 mist/graphics_selena/water_note_w.png create mode 100644 mist/graphics_selena/water_path_e.png create mode 100644 mist/graphics_selena/water_path_w.png create mode 100644 mist/graphics_selena/water_turn_n.png create mode 100644 mist/graphics_selena/water_turn_s.png create mode 100644 mist/graphics_selena/water_turn_w.png diff --git a/mist/common_defines.inc b/mist/common_defines.inc index 1b944b6d..dbff69e0 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -207,7 +207,9 @@ SELENA_SUB_ROOM = 7 SELENA_BOOK_ROOM = 8 SELENA_BOOK_CLOSED = 9 SELENA_BOOK_OPEN = 10 - +SELENA_WATER_TURN = 11 +SELENA_WATER_PATH = 12 +SELENA_WATER = 13 ; Viewer Room diff --git a/mist/graphics_selena/Makefile b/mist/graphics_selena/Makefile index d382b2b1..6205822f 100644 --- a/mist/graphics_selena/Makefile +++ b/mist/graphics_selena/Makefile @@ -20,7 +20,10 @@ selena_graphics.inc: \ bunker_n.lzsa bunker_s.lzsa bunker_e.lzsa \ subroom_s.lzsa \ book_table_s.lzsa \ - book_mist_open_s.lzsa book_mist_closed_s.lzsa + book_mist_open_s.lzsa book_mist_closed_s.lzsa \ + water_turn_n.lzsa water_turn_s.lzsa water_turn_w.lzsa \ + water_path_e.lzsa water_path_w.lzsa \ + water_note_e.lzsa water_note_w.lzsa water_note_s.lzsa echo "controls_e_lzsa: .incbin \"controls_e.lzsa\"" > selena_graphics.inc echo "organ_w_lzsa: .incbin \"organ_w.lzsa\"" >> selena_graphics.inc echo "spaceship_inside_w_lzsa: .incbin \"spaceship_inside_w.lzsa\"" >> selena_graphics.inc @@ -39,7 +42,14 @@ selena_graphics.inc: \ echo "book_table_s_lzsa: .incbin \"book_table_s.lzsa\"" >> selena_graphics.inc echo "book_mist_open_s_lzsa: .incbin \"book_mist_open_s.lzsa\"" >> selena_graphics.inc echo "book_mist_closed_s_lzsa: .incbin \"book_mist_closed_s.lzsa\"" >> selena_graphics.inc - + echo "water_turn_n_lzsa: .incbin \"water_turn_n.lzsa\"" >> selena_graphics.inc + echo "water_turn_s_lzsa: .incbin \"water_turn_s.lzsa\"" >> selena_graphics.inc + echo "water_turn_w_lzsa: .incbin \"water_turn_w.lzsa\"" >> selena_graphics.inc + echo "water_path_w_lzsa: .incbin \"water_path_w.lzsa\"" >> selena_graphics.inc + echo "water_path_e_lzsa: .incbin \"water_path_e.lzsa\"" >> selena_graphics.inc + echo "water_note_e_lzsa: .incbin \"water_note_e.lzsa\"" >> selena_graphics.inc + echo "water_note_w_lzsa: .incbin \"water_note_w.lzsa\"" >> selena_graphics.inc + echo "water_note_s_lzsa: .incbin \"water_note_s.lzsa\"" >> selena_graphics.inc %.gr: %.png $(PNG2GR) $< $@ diff --git a/mist/graphics_selena/water_note_e.png b/mist/graphics_selena/water_note_e.png new file mode 100644 index 0000000000000000000000000000000000000000..208c26694eb263c318a71082ceda24fa2020abdc GIT binary patch literal 1222 zcmV;%1UdVOP)EX>4Tx04R}tkv&MmKpe$iQ%glE9a==hAwzYtAS&XhRVYG*QY*CTU~=gfG-*gu zTpR`0f`cE6RRU7TlmpZjz4D+QAQK9P8q>4rtTK|H-_ z>74h8qpU0`#OK6g23?T&k?XR{Z=6dG3p_JwWHa-`QDU*w#c~(3vY`@B5yuo&qkJLf zvch?bvs$gQ_C5IvLj`SRnd>x%k;EdFkcJ2ubyQG=g*dGmDJC+spYZSxIsP=cWO7x& z$gzMLR7j2={11M2YZfOb+@w$f2)x+##|RMI1zHW;{yw(t)(PN$2ClS@zt#k1K1pwM zwAc|4-UcqNJDR))ToSYQT z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L02Fip02N>X zmRIYN00007bV*G`2jm474_CX>@2H zM@dakSAh-}0007UNkle3;^z4kMhiZD@UTUPp$3N|swT&2 zw&XAnz^5o5C-iIl?uB#pM2-}(Ax|TKUaZ%;`QD@K?IL~%V{k?>A zd^Wiqm_#&)+bdeE=wr=KFxU$erOz0?02wWK4|`XTAQ^2f_k?d!z}XTM zYGn&SlDM!1amItVt{B6-BTjGyG;sP2pawE((7F}h!v)_!p~h`nN@_N%djnKA)Z})A zAnUFIY#&E<=`?wAd&fBTz+>NX5r`m%htzG*-W%8e&tbT;!6}WS&$0swGp+@V1lo4W zvG+5;UO;%U2Xp325x{9uo_;N`OslsU`|i1E;yV_81t_!u%MAU)Uf{NIAAusn4BK4Q zx0a`Yd?~S}`^E=vuf~;i1msyqX*tfUR-Hba6s@5!L4 zHCHw}0+I7s&A6BSgsc0S_4DV7m8Qi~@;TKYGvT~ermSms(3E`}fh5IgGKOUNXUy?^ zM`iXM-^WoPNYz(;5P&|b$0KJlAn^%s-*u%m+~yX@G=+h`8_4x&-*d(Q28x>^a|4lG k7u4TNQXrl=Y;FYp0128xVsd7il>h($07*qoM6N<$f;T59%K!iX literal 0 HcmV?d00001 diff --git a/mist/graphics_selena/water_note_s.png b/mist/graphics_selena/water_note_s.png new file mode 100644 index 0000000000000000000000000000000000000000..8e1698f5c7abbddd6f69ae7a6731e132472327c9 GIT binary patch literal 1253 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 LNkvXXu0mjfh%uB9 literal 0 HcmV?d00001 diff --git a/mist/graphics_selena/water_turn_s.png b/mist/graphics_selena/water_turn_s.png new file mode 100644 index 0000000000000000000000000000000000000000..02474a9be33cebd8731cb8bed678e63a3804052b GIT binary patch literal 907 zcmV;619bd}P)EX>4Tx04R}tkv&MmKpe$iQ%glE9a==hAwzYtAS&XhRVYG*QY*CTU~=gfG-*gu zTpR`0f`cE6RRU7TlmpZjz4D+QAQK9P8q>4rtTK|H-_ z>74h8qpU0`#OK6g23?T&k?XR{Z=6dG3p_JwWHa-`QDU*w#c~(3vY`@B5yuo&qkJLf zvch?bvs$gQ_C5IvLj`SRnd>x%k;EdFkcJ2ubyQG=g*dGmDJC+spYZSxIsP=cWO7x& z$gzMLR7j2={11M2YZfOb+@w$f2)x+##|RMI1zHW;{yw(t)(PN$2ClS@zt#k1K1pwM zwAc|4-UcqNJDR))ToSYQT z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L02Fip02N>X zmRIYN00007bV*G`2jm476B{&YaaI8U000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H zM@dakSAh-}0003tNkl1P zl4|`3O{z7P{01Y*cY&q+LokX=rNo{w!Pz1^o$zt1%I^o)$o`eq+%E5(@lS(5K3he= zFbjFsV z9AsbuGU9{Rs|1^f28mn-<@qEje;ZKG;|fUcn^RDd1YR!dAdsfN9*D6Oqx%jkuYj`l z2K2^y4%$LJ3C_4v(EF$OGv~kR9Pl_cxH`r*$lLjJ0ia!318@Cq3mN0A(p%sd;h-Mq h*+=asK--W<;3t!JO$*Q$CyoFB002ovPDHLkV1nrch&liO literal 0 HcmV?d00001 diff --git a/mist/graphics_selena/water_turn_w.png b/mist/graphics_selena/water_turn_w.png new file mode 100644 index 0000000000000000000000000000000000000000..e634574d2f0959a73bb867658e96c7816243c0cb GIT binary patch literal 928 zcmV;R17G}!P)EX>4Tx04R}tkv&MmKpe$iQ%glE9a==hAwzYtAS&XhRVYG*QY*CTU~=gfG-*gu zTpR`0f`cE6RRU7TlmpZjz4D+QAQK9P8q>4rtTK|H-_ z>74h8qpU0`#OK6g23?T&k?XR{Z=6dG3p_JwWHa-`QDU*w#c~(3vY`@B5yuo&qkJLf zvch?bvs$gQ_C5IvLj`SRnd>x%k;EdFkcJ2ubyQG=g*dGmDJC+spYZSxIsP=cWO7x& z$gzMLR7j2={11M2YZfOb+@w$f2)x+##|RMI1zHW;{yw(t)(PN$2ClS@zt#k1K1pwM zwAc|4-UcqNJDR))ToSYQT z{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E%000SaNLh0L02Fip02N>X zmRIYN00007bV*G`2jm476ATy4m80bV000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2H zM@dakSAh-}0003?Nkl-5f2z*}^juhYw$>1LJbxu?1 zgW51H@X|1Z9Ne~h;MwpqP^Jp|8>AC^z%vYvkh~AQe+_y#^y;`3W?`_mJd9EFe6HkL zAoZ3z=Fcnvy*EKb3oOa>Lneqg1E!ri1tQY_+`@(y$d|-dZi6{V{h|tUG2Q@UH3DkV z1ViY9DP2(R4kEw|7^4CH9HAqCI22hfXZNEmALBU4@2=gi1Oe(l(FEoG5tx$z7ASF6 zKWV5zI5P#N6=qOKfSX|6P|zH-$xg#Gb{PXKPjNr$)+UERc|wR`WPWn}%ea`o+wdY?{!*7ix`QvLw8=51F)Drd<60000red_page_sprite + sta INH + + jmp put_sprite_crop ; tail call + + +draw_blue_page: + + lda DIRECTION + cmp #DIRECTION_S + bne no_draw_page + + lda BLUE_PAGES_TAKEN + and #SELENA_PAGE + bne no_draw_page + + lda #20 + sta XPOS + lda #26 + sta YPOS + + lda #blue_page_sprite + sta INH + + jmp put_sprite_crop ; tail call + +no_draw_page: + rts + + + ;========================== ; includes ;========================== @@ -290,7 +364,10 @@ save_rocket_state: .include "link_book_mist.s" + .include "handle_pages.s" + .include "common_sprites.inc" + .include "page_sprites.inc" .include "leveldata_selena.inc"