From e05ea0e865585a753bb141167496aee313f23628 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Mon, 20 Jul 2020 16:03:12 -0400 Subject: [PATCH] mist: viewer: add another step, add views of ship also fix bug in mist where first background drawn befor updating bgs --- mist/TODO | 11 +++--- mist/common_defines.inc | 9 ++--- mist/graphics_viewer/Makefile | 10 +++++- mist/graphics_viewer/viewer_entrance_e.png | Bin 0 -> 822 bytes .../viewer_entrance_ship_e.png | Bin 0 -> 852 bytes mist/graphics_viewer/viewer_entrance_w.png | Bin 0 -> 838 bytes mist/graphics_viewer/viewer_movies.png | Bin 17155 -> 17079 bytes mist/graphics_viewer/viewer_stairs_ship_e.png | Bin 0 -> 10257 bytes mist/leveldata_viewer.inc | 34 +++++++++++++----- mist/mist.s | 16 ++++----- mist/mist_puzzles.s | 5 ++- mist/viewer.s | 25 +++++++++++++ 12 files changed, 82 insertions(+), 28 deletions(-) create mode 100644 mist/graphics_viewer/viewer_entrance_e.png create mode 100644 mist/graphics_viewer/viewer_entrance_ship_e.png create mode 100644 mist/graphics_viewer/viewer_entrance_w.png create mode 100644 mist/graphics_viewer/viewer_stairs_ship_e.png diff --git a/mist/TODO b/mist/TODO index d7caff91..dc6b4599 100644 --- a/mist/TODO +++ b/mist/TODO @@ -3,11 +3,10 @@ For release 1.0 + LOADER -- save game -- joystick support - -- ^T to toggle sound + MIST - -- make sure gear opening looks OK with new art -- open door to clock puzzle? + -- only allow entering ship if it's up + OCTAGON -- load "red page" sound into LC and play it? @@ -31,16 +30,16 @@ For release 1.0 + NIBEL -- turn on sprite crop in the viewer part -+ DNI - -- add good ending - linking book to MYST ++ VIEWER + -- have ship up background if ship up + Done: + CABIN + DENTIST ++ DNI + MECHE + MIST_TITLE -+ VIEWER + ARBOR + SHIP diff --git a/mist/common_defines.inc b/mist/common_defines.inc index 6f0f57e4..f68435dc 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -259,10 +259,11 @@ SELENA_BUNKER_KEYPAD = 49 ; Viewer Room -VIEWER_STEPS = 0 -VIEWER_POOL = 1 -VIEWER_POOL_CLOSE = 2 -VIEWER_CONTROL_PANEL = 3 +VIEWER_ENTRANCE = 0 +VIEWER_STEPS = 1 +VIEWER_POOL = 2 +VIEWER_POOL_CLOSE = 3 +VIEWER_CONTROL_PANEL = 4 ; Ship SHIP_STERN = 0 diff --git a/mist/graphics_viewer/Makefile b/mist/graphics_viewer/Makefile index c679e7ee..bb24d9df 100644 --- a/mist/graphics_viewer/Makefile +++ b/mist/graphics_viewer/Makefile @@ -12,13 +12,21 @@ viewer_graphics.inc: \ viewer_e.lzsa viewer_w.lzsa \ viewer_far_w.lzsa \ viewer_stairs_e.lzsa viewer_stairs_w.lzsa \ - viewer_controls_e.lzsa + viewer_stairs_ship_e.lzsa \ + viewer_controls_e.lzsa \ + viewer_entrance_e.lzsa viewer_entrance_ship_e.lzsa \ + viewer_entrance_w.lzsa echo "viewer_e_lzsa: .incbin \"viewer_e.lzsa\"" > viewer_graphics.inc echo "viewer_far_w_lzsa: .incbin \"viewer_far_w.lzsa\"" >> viewer_graphics.inc echo "viewer_w_lzsa: .incbin \"viewer_w.lzsa\"" >> viewer_graphics.inc echo "viewer_stairs_e_lzsa: .incbin \"viewer_stairs_e.lzsa\"" >> viewer_graphics.inc + echo "viewer_stairs_ship_e_lzsa: .incbin \"viewer_stairs_ship_e.lzsa\"" >> viewer_graphics.inc echo "viewer_stairs_w_lzsa: .incbin \"viewer_stairs_w.lzsa\"" >> viewer_graphics.inc echo "viewer_controls_e_lzsa: .incbin \"viewer_controls_e.lzsa\"" >> viewer_graphics.inc + echo "viewer_entrance_e_lzsa: .incbin \"viewer_entrance_e.lzsa\"" >> viewer_graphics.inc + echo "viewer_entrance_ship_e_lzsa: .incbin \"viewer_entrance_ship_e.lzsa\"" >> viewer_graphics.inc + echo "viewer_entrance_w_lzsa: .incbin \"viewer_entrance_w.lzsa\"" >> viewer_graphics.inc + %.gr: %.png diff --git a/mist/graphics_viewer/viewer_entrance_e.png b/mist/graphics_viewer/viewer_entrance_e.png new file mode 100644 index 0000000000000000000000000000000000000000..ef0939c5e4346787bdd0d1eed4e55eb6e8b81331 GIT binary patch literal 822 zcmV-61Ihe}P)EX>4Tx04R}tkv&MmKpe$iQ>7vmL4$}mWT;LSL`5963Pq?8YK2xEOfLO`CJjl8 zi=*ILaPVWX>fqw6tAnc`2!4P#IXWr2NQwVT3N2zhIPS;0dyl(!fKV?n-R>9%bfaP= z<1s0nS(QSs2th<21|TWSHs@qH0pIa;j{slqqCCt0+@GUI%i0VGNW`)O(FKVgxvqNr#yRh@z%xZFm7FIQiKToSt8L5*mQFlH9MN=x@`bd= z8s{y}da25q_v9}OXN{F*uG1Vw9E(_j3<)Z#D58W4qO=;M*htcT%*Q|E`ekyd($qcRat9cEG8Id4r65fqmjm9<=$kS?|1HqH=JnRx$LRx*qOKA*z`-Ff zny2h_pLch)_xA6ZW`93nnsT5t8@1g4001*kOjJbx00842U|>$Y|3v)&qhOqzoD|Rf z(8K>=as&TrJe{4L|Dezm^*qqsjdK6c|Ns90005njhJXM7010qNS#tmY6m$Rp6<`6D zSL>1h000McNliruk02y>eSad^gZEa<4bO1wgWnpw>WFU8GbZ8() zNlj2!fese{0081iL_t(Y$L-eH4#FT11<)H4Y<+0?|G$+;Oqm6Qftr%^CO)*v$*>6E z5dy@IJx6OCk8LDKlJ_ZPtFi!ENIqPmv#lK$?IluAYD1+?2P&hLkeT0;z;*SX0Iv|h z`|oon$U{Lk17$E~7#L%!kT0CHLIWsQVhTP*%wWte(ph01)OM*K;I76D0?RTO)JCua z+(P~iik(XNdnehH(EX+nT$S8l8z@PB2;AU|AZ_48hJ%zG4)XKzOc0m@|9 zw%rrS-KGa5_lT6ScA2cp6Ttk}E|aT(u8^6*Hvm{Cnb&N#aR2}S07*qoM6N<$g2_Z? AX#fBK literal 0 HcmV?d00001 diff --git a/mist/graphics_viewer/viewer_entrance_ship_e.png b/mist/graphics_viewer/viewer_entrance_ship_e.png new file mode 100644 index 0000000000000000000000000000000000000000..6e21fb2d9ad2bf278f081826ae7526b0de294562 GIT binary patch literal 852 zcmV-a1FQUrP)EX>4Tx04R}tkv&MmKpe$iQ>7vmL4$}mWT;LSL`5963Pq?8YK2xEOfLO`CJjl8 zi=*ILaPVWX>fqw6tAnc`2!4P#IXWr2NQwVT3N2zhIPS;0dyl(!fKV?n-R>9%bfaP= z<1s0nS(QSs2th<21|TWSHs@qH0pIa;j{slqqCCt0+@GUI%i0VGNW`)O(FKVgxvqNr#yRh@z%xZFm7FIQiKToSt8L5*mQFlH9MN=x@`bd= z8s{y}da25q_v9}OXN{F*uG1Vw9E(_j3<)Z#D58W4qO=;M*htcT%*Q|E`ekyd($qcRat9cEG8Id4r65fqmjm9<=$kS?|1HqH=JnRx$LRx*qOKA*z`-Ff zny2h_pLch)_xA6ZW`93nnsT5t8@1g4001*kOjJbx00842U|>$Y|3v)&qhOqzoD|Rf z(8K>=as&TrJe{4L|Dezm^*qqsjdK6c|Ns90005njhJXM7010qNS#tmY6m$Rp6<`6D zSL>1h000McNlirueSad^gZEa<4bO1wgWnpw>WFU8GbZ8() zNlj2!fese{0096=L_t(Y$L-eL3WOjK1>nQNgkF^I|F)Z}i_SQDPNL$gAg7fh8rV%ts9EX>4Tx04R}tkv&MmKpe$iQ>7vmL4$}mWT;LSL`5963Pq?8YK2xEOfLO`CJjl8 zi=*ILaPVWX>fqw6tAnc`2!4P#IXWr2NQwVT3N2zhIPS;0dyl(!fKV?n-R>9%bfaP= z<1s0nS(QSs2th<21|TWSHs@qH0pIa;j{slqqCCt0+@GUI%i0VGNW`)O(FKVgxvqNr#yRh@z%xZFm7FIQiKToSt8L5*mQFlH9MN=x@`bd= z8s{y}da25q_v9}OXN{F*uG1Vw9E(_j3<)Z#D58W4qO=;M*htcT%*Q|E`ekyd($qcRat9cEG8Id4r65fqmjm9<=$kS?|1HqH=JnRx$LRx*qOKA*z`-Ff zny2h_pLch)_xA6ZW`93nnsT5t8@1g4001*kOjJbx00842U|>$Y|3v)&qhOqzoD|Rf z(8K>=as&TrJe{4L|Dezm^*qqsjdK6c|Ns90005njhJXM7010qNS#tmY6m$Rp6<`6D zSL>1h000McNliruFr{02y>eSad^gZEa<4bO1wgWnpw>WFU8GbZ8() zNlj2!fese{008nyL_t(Y$L-e94uc>J1<=N%u|6#R|KAR#j#A1jRA*wmZ-^X=XaI&a z0D~iGH1LaC`Z)!(5t9r+843&FwV$_^-xAiZGq6mTjSxkN6lMo|807El`p+lQ@zwUz;F zP5Q&&m{<=5V$%6KyXJ*TP6a!;agCeg7)QIov62J0`4cB8IZnF3Im;gS2HVjVD|-*_ Q!~g&Q07*qoM6N<$f@*hcTmS$7 literal 0 HcmV?d00001 diff --git a/mist/graphics_viewer/viewer_movies.png b/mist/graphics_viewer/viewer_movies.png index 0fec8d85c77c0d4bd2808e0e5b2ef26dd05985b5..abf63e3122ca7194cf86e1db197fbdd4f031a113 100644 GIT binary patch delta 12880 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 diff --git a/mist/graphics_viewer/viewer_stairs_ship_e.png b/mist/graphics_viewer/viewer_stairs_ship_e.png new file mode 100644 index 0000000000000000000000000000000000000000..46402f11b9235804ca492557270f7b178126cd66 GIT binary patch literal 10257 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 literal 0 HcmV?d00001 diff --git a/mist/leveldata_viewer.inc b/mist/leveldata_viewer.inc index c22e8f9f..3368ee53 100644 --- a/mist/leveldata_viewer.inc +++ b/mist/leveldata_viewer.inc @@ -5,12 +5,33 @@ locations: .word location0, location1, location2, location3 + .word location4 -; VIEWER_STEPS -- steps +; VIEWER_ENTRANCE -- top of steps location0: .byte $ff ; north exit .byte $ff ; south exit .byte $ff ; east exit + .byte VIEWER_STEPS ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_E ; east exit_dir + .byte DIRECTION_W ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word viewer_entrance_e_lzsa ; east bg + .word viewer_entrance_w_lzsa ; west bg + .byte BG_WEST | BG_EAST + .byte DIRECTION_E ; special exit + .byte 9,29 ; special x + .byte 2,46 ; special y + .word back_to_mist-1 ; special function + +; VIEWER_STEPS -- steps +location1: + .byte $ff ; north exit + .byte $ff ; south exit + .byte VIEWER_ENTRANCE ; east exit .byte VIEWER_POOL ; west exit .byte $ff ; north exit_dir .byte $ff ; south exit_dir @@ -21,13 +42,10 @@ location0: .word viewer_stairs_e_lzsa ; east bg .word viewer_stairs_w_lzsa ; west bg .byte BG_WEST | BG_EAST - .byte DIRECTION_E ; special exit - .byte 9,29 ; special x - .byte 2,46 ; special y - .word back_to_mist-1 ; special function + .byte $ff ; special exit ; VIEWER_POOL -- the viewer far -location1: +location2: .byte $ff ; north exit .byte $ff ; south exit .byte VIEWER_STEPS ; east exit @@ -47,7 +65,7 @@ location1: .word enter_control_panel-1 ; special function ; VIEWER_POOL_CLOSE -- the viewer close -location2: +location3: .byte $ff ; north exit .byte $ff ; south exit .byte $ff ; east exit @@ -69,7 +87,7 @@ location2: ; VIEWER_CONTROL_PANEL -- the viewer control panel -location3: +location4: .byte $ff ; north exit .byte $ff ; south exit .byte VIEWER_POOL ; east exit diff --git a/mist/mist.s b/mist/mist.s index 298eda94..89792cee 100644 --- a/mist/mist.s +++ b/mist/mist.s @@ -44,13 +44,6 @@ mist_start: sta CURSOR_X sta CURSOR_Y - ; set up initial location - - jsr change_location - - lda #1 - sta CURSOR_VISIBLE ; visible at first - ; init the clock bridge jsr raise_bridge @@ -58,8 +51,15 @@ mist_start: jsr open_the_gear ; make the ship right + jsr adjust_ship + ; set up initial location + + jsr change_location + + lda #1 + sta CURSOR_VISIBLE ; visible at first game_loop: ;================= @@ -244,7 +244,7 @@ goto_dentist: enter_viewer: - lda #VIEWER_STEPS + lda #VIEWER_ENTRANCE sta LOCATION lda #LOAD_VIEWER diff --git a/mist/mist_puzzles.s b/mist/mist_puzzles.s index eb626ae9..80b1871f 100644 --- a/mist/mist_puzzles.s +++ b/mist/mist_puzzles.s @@ -86,9 +86,10 @@ make_ship_up: lda #dock_shipup_e_lzsa sta location0+1,Y ; MIST_ARRIVAL_DOCK - + sta location30+1,Y ; MIST_VIEWER_DOOR ; FIXME: hook up exit on dock to ship @@ -171,8 +172,10 @@ make_ship_down: lda #dock_e_lzsa sta location0+1,Y ; MIST_ARRIVAL_DOCK + sta location30+1,Y ; MIST_VIEWER_DOOR ; FIXME: remove exit on dock to ship diff --git a/mist/viewer.s b/mist/viewer.s index a9028128..67d17ac0 100644 --- a/mist/viewer.s +++ b/mist/viewer.s @@ -40,6 +40,9 @@ viewer_start: sta CURSOR_X sta CURSOR_Y + ; set up ship backgrounds + jsr setup_backgrounds + ; set up initial location jsr change_location @@ -152,6 +155,28 @@ back_to_mist: rts + ; handle ship up or down +setup_backgrounds: + + lda SHIP_RAISED + beq done_raised + + ldy #LOCATION_EAST_BG + + lda #viewer_entrance_ship_e_lzsa + sta location0+1,Y ; VIEWER_ENTRANCE + + lda #viewer_stairs_ship_e_lzsa + sta location1+1,Y ; VIEWER_SHIP + +done_raised: + rts + + ;========================== ; includes ;==========================