From d91169a2e77aa3563001094bf2372d3b31d75f69 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Sat, 13 Jun 2020 00:27:13 -0400 Subject: [PATCH] mist: channelwood: can raise the bridge now --- mist/Makefile | 1 + mist/channel.s | 7 ++- mist/channel_switches.s | 81 ++++++++++++++++++++++++++ mist/graphics_channel/Makefile | 3 +- mist/graphics_channel/bridge_up_e.png | Bin 0 -> 14761 bytes mist/leveldata_channel.inc | 13 +++-- mist/link_book_channel.s | 22 +++---- mist/zp.inc | 16 +++-- 8 files changed, 118 insertions(+), 25 deletions(-) create mode 100644 mist/channel_switches.s create mode 100644 mist/graphics_channel/bridge_up_e.png diff --git a/mist/Makefile b/mist/Makefile index 2c7658ed..2a09afa7 100644 --- a/mist/Makefile +++ b/mist/Makefile @@ -186,6 +186,7 @@ channel.o: channel.s zp.inc hardware.inc common_defines.inc \ common_sprites.inc \ page_sprites.inc \ leveldata_channel.inc \ + channel_switches.s \ keyboard.s \ draw_pointer.s \ link_book_channel.s \ diff --git a/mist/channel.s b/mist/channel.s index 5546da30..4f040415 100644 --- a/mist/channel.s +++ b/mist/channel.s @@ -253,12 +253,15 @@ exit_to_mist: .include "graphics_channel/channel_graphics.inc" - ; puzzles + ; sprites .include "common_sprites.inc" - .include "page_sprites.inc" + ; puzzles + + .include "channel_switches.s" + .include "leveldata_channel.inc" ; linking books diff --git a/mist/channel_switches.s b/mist/channel_switches.s new file mode 100644 index 00000000..2d6e4f70 --- /dev/null +++ b/mist/channel_switches.s @@ -0,0 +1,81 @@ +;======================= +; raise bridge + +; if CHANNEL_SWITCHES CHANNEL_SW_WINDMILL and CHANNEL_SW_FAUCET +; TODO: also if various valves in correct pattern + +raise_bridge: + + bit $C030 ; click speaker + + ; only raise it if water is flowing + + lda CHANNEL_SWITCHES + and #CHANNEL_SW_WINDMILL|CHANNEL_SW_FAUCET + cmp #CHANNEL_SW_WINDMILL|CHANNEL_SW_FAUCET +; bne no_raise_bridge + + + ; only raise the bridge, don't think you can lower it + + lda CHANNEL_SWITCHES + ora #CHANNEL_BRIDGE_UP + sta CHANNEL_SWITCHES + + jsr adjust_after_changes + + jsr change_location + +no_raise_bridge: + rts + + + + ; should call this when entering level +adjust_after_changes: + + +adjust_bridge: + ;======================= + ; put bridge up or down + + lda CHANNEL_SWITCHES + and #CHANNEL_BRIDGE_UP + beq bridge_is_down + +bridge_is_up: + ; change to bridge up bg + ldy #LOCATION_EAST_BG + + lda #bridge_up_e_lzsa + sta location16+1,Y ; CHANNEL_BRIDGE + + ; change to allow crossing bridge + ldy #LOCATION_EAST_EXIT + lda #CHANNEL_AFTER_BRIDGE1 + sta location16,Y ; CHANNEL_BRIDGE + jmp adjust_pipe + +bridge_is_down: + ; change to bridge down bg + + ldy #LOCATION_EAST_BG + + lda #bridge_down_e_lzsa + sta location16+1,Y ; CHANNEL_BRIDGE + + ; change to allow crossing bridge + ldy #LOCATION_EAST_EXIT + lda #$ff + sta location16,Y ; CHANNEL_BRIDGE + +adjust_pipe: + ;======================= + ; extend pipe or not + + + rts diff --git a/mist/graphics_channel/Makefile b/mist/graphics_channel/Makefile index 65eb0a1b..56bf82eb 100644 --- a/mist/graphics_channel/Makefile +++ b/mist/graphics_channel/Makefile @@ -23,7 +23,7 @@ channel_graphics.inc: \ tree_basement_book_open_s.lzsa \ tree_basement_book_closed_s.lzsa \ tree_elevator_basement_s.lzsa \ - bridge_w.lzsa bridge_down_e.lzsa \ + bridge_w.lzsa bridge_down_e.lzsa bridge_up_e.lzsa \ path2_e.lzsa path2_s.lzsa path2_n.lzsa \ path3_w.lzsa path3_e.lzsa path3_n.lzsa \ path4_e.lzsa path4_w.lzsa path4_s.lzsa \ @@ -73,6 +73,7 @@ channel_graphics.inc: \ echo "tree_elevator_basement_s_lzsa: .incbin \"tree_elevator_basement_s.lzsa\"" >> channel_graphics.inc echo "bridge_w_lzsa: .incbin \"bridge_w.lzsa\"" >> channel_graphics.inc echo "bridge_down_e_lzsa: .incbin \"bridge_down_e.lzsa\"" >> channel_graphics.inc + echo "bridge_up_e_lzsa: .incbin \"bridge_up_e.lzsa\"" >> channel_graphics.inc echo "path2_n_lzsa: .incbin \"path2_n.lzsa\"" >> channel_graphics.inc echo "path2_s_lzsa: .incbin \"path2_s.lzsa\"" >> channel_graphics.inc echo "path2_e_lzsa: .incbin \"path2_e.lzsa\"" >> channel_graphics.inc diff --git a/mist/graphics_channel/bridge_up_e.png b/mist/graphics_channel/bridge_up_e.png new file mode 100644 index 0000000000000000000000000000000000000000..c6a1e178ea63121b38310a0700b0c82826e82b24 GIT binary patch literal 14761 zcmeHtWmFtp)^6iYa1S&VNC@q)D!6B;%I4O2Lrl!JHdc3FB?k$z-y_r!^(wOfT;AAt}2sR zJa$(+>jVDU*L|UGn05nKWBXfL8!a7a;Kqp@gn;Mv{+(E!V)GYRc zXF%nZ|HbX)600Sj=FK3y>=WW()Dfs zlC#xFzx@R&$@c_51;4Ic4cY}{XV>KiUW4y<8bm*zv9E{)+?E7?_bF;#FPB)$*9q&A z0o`AF)A0ue_LiloLeY8(no)jFad#D-zotre zVxFeUBi4r_n16Cjq_0~@bOU{bN_)AVIib5E;@G~QUF)*9>s9GVGxjC@{>J9#aO}^S zeSufZ`wr0rKHrd!o<-nFy_oSdmc?B8t^|Ke{NwVw2)$S^UKn`QrqEQ5 zaOzLpheTq}gCROts&HB^}AW;G`0<)p%Q4I4IE zGStkV%o!SRo6-d}b7kHI4O{zW{&i&Q9ID-qaN8Qs@kIfbiL mKzx@RmGdBG-X+ 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 literal 0 HcmV?d00001 diff --git a/mist/leveldata_channel.inc b/mist/leveldata_channel.inc index d6d346bb..023b83a7 100644 --- a/mist/leveldata_channel.inc +++ b/mist/leveldata_channel.inc @@ -317,7 +317,10 @@ location16: .word bridge_down_e_lzsa ; east bg .word bridge_w_lzsa ; west bg .byte BG_WEST|BG_EAST - .byte $ff + .byte DIRECTION_E ; special exit + .byte 14,20 ; special x + .byte 28,36 ; special y + .word raise_bridge-1 ; CHANNEL_PATH4 -- twisty maze of passages all alike location17: @@ -677,7 +680,7 @@ location37: .byte $ff ; north exit_dir .byte $ff ; south exit_dir .byte DIRECTION_E ; east exit_dir - .byte DIRECTION_E ; west exit_dir + .byte DIRECTION_W ; west exit_dir .word $0000 ; north bg .word $0000 ; south bg .word after_bridge1_e_lzsa ; east bg @@ -689,8 +692,8 @@ location37: location38: .byte $ff ; north exit .byte $ff ; south exit - .byte CHANNEL_AFTER_BRIDGE1 ; east exit - .byte CHANNEL_BOOK_FORK ; west exit + .byte CHANNEL_BOOK_FORK ; east exit + .byte CHANNEL_AFTER_BRIDGE1 ; west exit .byte $ff ; north exit_dir .byte $ff ; south exit_dir .byte DIRECTION_N ; east exit_dir @@ -715,7 +718,7 @@ location39: .word book_fork_n_lzsa ; north bg .word book_fork_s_lzsa ; south bg .word $0000 ; east bg - .word $0000 ; west bg + .word book_fork_w_lzsa ; west bg .byte BG_NORTH|BG_SOUTH|BG_WEST .byte $ff diff --git a/mist/link_book_channel.s b/mist/link_book_channel.s index b9f814bb..137c5f87 100644 --- a/mist/link_book_channel.s +++ b/mist/link_book_channel.s @@ -16,22 +16,22 @@ channel_link_book: ;==================================== ; load linking audio (12k) to $9000 - lda #linking_filename - sta OUTH +; lda #linking_filename +; sta OUTH - jsr opendir_filename +; jsr opendir_filename ; play sound effect? - lda #linking_noise - sta BTC_H - ldx #LINKING_NOISE_LENGTH ; 45 pages long??? - jsr play_audio +; lda #linking_noise +; sta BTC_H +; ldx #LINKING_NOISE_LENGTH ; 45 pages long??? +; jsr play_audio lda #CHANNEL_ARRIVAL sta LOCATION diff --git a/mist/zp.inc b/mist/zp.inc index b38642bf..4604fa1f 100644 --- a/mist/zp.inc +++ b/mist/zp.inc @@ -134,14 +134,18 @@ COMPASS_ANGLE = $AF CRANK_ANGLE = $B0 WHITE_PAGE_TAKEN= $B1 CHANNEL_SWITCHES= $B2 - CHANNEL_SW1 = $01 - CHANNEL_SW2 = $02 - CHANNEL_SW3 = $04 - CHANNEL_SW4 = $08 - CHANNEL_SW5 = $10 - CHANNEL_SW6 = $20 + CHANNEL_BRIDGE_UP = $01 + CHANNEL_PIPE_EXTENDED = $02 CHANNEL_SW_WINDMILL = $40 CHANNEL_SW_FAUCET = $80 +CHANNEL_VALVES = $B3 + CHANNEL_VALVE1 = $01 + CHANNEL_VALVE2 = $02 + CHANNEL_VALVE3 = $04 + CHANNEL_VALVE4 = $08 + CHANNEL_VALVE5 = $10 + CHANNEL_VALVE6 = $20 + ; done game puzzle state