From 467549a01885e7d00d59c9b4c48fcde26d90370f Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Mon, 22 Jun 2020 01:21:09 -0400 Subject: [PATCH] mist: arbor: can walk to switch --- mist/arbor.s | 2 + mist/arbor_switches.s | 63 ++++++++++++++++ mist/common_defines.inc | 4 + mist/default_save.s | 6 +- mist/graphics_arbor/Makefile | 16 +++- mist/graphics_arbor/switch_bridge1_n.png | Bin 0 -> 1086 bytes mist/graphics_arbor/switch_bridge1_s.png | Bin 0 -> 1208 bytes mist/graphics_arbor/switch_bridge2_e.png | Bin 0 -> 1186 bytes mist/graphics_arbor/switch_bridge2_w.png | Bin 0 -> 1246 bytes mist/graphics_arbor/switch_hut1_e.png | Bin 0 -> 1180 bytes mist/graphics_arbor/switch_hut1_n.png | Bin 0 -> 1222 bytes mist/graphics_arbor/switch_hut_closed_s.png | Bin 0 -> 1192 bytes mist/graphics_arbor/switch_hut_open_s.png | Bin 0 -> 13739 bytes mist/graphics_arbor/switch_hut_w.png | Bin 0 -> 1197 bytes mist/leveldata_arbor.inc | 78 +++++++++++++++++++- mist/zp.inc | 1 + 16 files changed, 163 insertions(+), 7 deletions(-) create mode 100644 mist/graphics_arbor/switch_bridge1_n.png create mode 100644 mist/graphics_arbor/switch_bridge1_s.png create mode 100644 mist/graphics_arbor/switch_bridge2_e.png create mode 100644 mist/graphics_arbor/switch_bridge2_w.png create mode 100644 mist/graphics_arbor/switch_hut1_e.png create mode 100644 mist/graphics_arbor/switch_hut1_n.png create mode 100644 mist/graphics_arbor/switch_hut_closed_s.png create mode 100644 mist/graphics_arbor/switch_hut_open_s.png create mode 100644 mist/graphics_arbor/switch_hut_w.png diff --git a/mist/arbor.s b/mist/arbor.s index 09b09143..9a78dbdb 100644 --- a/mist/arbor.s +++ b/mist/arbor.s @@ -53,6 +53,8 @@ arbor_start: lda #0 sta ANIMATE_FRAME + ; update state of switch-related stuff + jsr update_arbor_state game_loop: ;================= diff --git a/mist/arbor_switches.s b/mist/arbor_switches.s index 1da4c505..2626141b 100644 --- a/mist/arbor_switches.s +++ b/mist/arbor_switches.s @@ -36,3 +36,66 @@ elev1_close_door: jmp change_location + ;================================== + ; hut handle, toggle top stair gate +hut_handle: + lda CHANNEL_SWITCHES + eor #CHANNEL_SW_GATE_TOP + sta CHANNEL_SWITCHES + jsr update_arbor_state + jmp change_location + + + ;=============================================== + ; update all backgrounds based on switch states + +update_arbor_state: + + lda CHANNEL_SWITCHES + and #CHANNEL_SW_GATE_TOP + beq top_gate_closed + +top_gate_open: + + ; change top gate to open + ldy #LOCATION_SOUTH_BG + + lda #switch_hut_open_s_lzsa + sta location14+1,Y ; ARBOR_SWITCH_HUT + + ; FIXME: change gate graphic close + ; FIXME: change gate exit + ; change to allow crossing bridge +; ldy #LOCATION_EAST_EXIT +; lda #CHANNEL_AFTER_BRIDGE1 +; sta location3,Y ; CHANNEL_BRIDGE + + jmp top_gate_done +top_gate_closed: + + ; change top gate to open + ldy #LOCATION_SOUTH_BG + + lda #switch_hut_closed_s_lzsa + sta location14+1,Y ; ARBOR_SWITCH_HUT + + ; FIXME: change gate graphic close + ; FIXME: change gate exit + ; change to allow crossing bridge +; ldy #LOCATION_EAST_EXIT +; lda #CHANNEL_AFTER_BRIDGE1 +; sta location3,Y ; CHANNEL_BRIDGE + + +top_gate_done: + +done_update_arbor_state: + + rts + + + diff --git a/mist/common_defines.inc b/mist/common_defines.inc index ab281221..ffcabd5c 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -369,3 +369,7 @@ ARBOR_SHACK1 = 7 ARBOR_BRIDGE3 = 8 ARBOR_LONGSHACK1 = 9 ARBOR_LONGSHACK2 = 10 +ARBOR_SWITCH_BRIDGE1 = 11 +ARBOR_SWITCH_HUT1 = 12 +ARBOR_SWITCH_BRIDGE2 = 13 +ARBOR_SWITCH_HUT = 14 diff --git a/mist/default_save.s b/mist/default_save.s index f4e1dec3..fe7644cd 100644 --- a/mist/default_save.s +++ b/mist/default_save.s @@ -3,9 +3,9 @@ ; want to load this to address $80 -.byte LOAD_OCTAGON ; WHICH_LOAD = $80 -.byte DIRECTION_S ; DIRECTION = $81 -.byte OCTAGON_TEMPLE_CENTER ; LOCATION = $82 +.byte LOAD_ARBOR ; WHICH_LOAD = $80 +.byte DIRECTION_W ; DIRECTION = $81 +.byte ARBOR_ARRIVAL_CLOSED ; LOCATION = $82 .byte $00 ; RED_PAGES_TAKEN = $83 .byte $00 ; BLUE_PAGES_TAKEN = $84 .byte $00 ; CLOCK_BRIDGE = $85 diff --git a/mist/graphics_arbor/Makefile b/mist/graphics_arbor/Makefile index 773deadd..048d8e02 100644 --- a/mist/graphics_arbor/Makefile +++ b/mist/graphics_arbor/Makefile @@ -17,7 +17,11 @@ arbor_graphics.inc: \ shack1_n.lzsa shack1_s.lzsa shack1_e.lzsa shack1_w.lzsa \ bridge3_e.lzsa bridge3_w.lzsa \ longshack1_e.lzsa longshack1_w.lzsa \ - longshack2_e.lzsa longshack2_w.lzsa longshack2_n.lzsa longshack2_s.lzsa + longshack2_e.lzsa longshack2_w.lzsa longshack2_n.lzsa longshack2_s.lzsa \ + switch_bridge1_n.lzsa switch_bridge1_s.lzsa \ + switch_hut1_n.lzsa switch_hut1_e.lzsa \ + switch_bridge2_e.lzsa switch_bridge2_w.lzsa \ + switch_hut_w.lzsa switch_hut_closed_s.lzsa switch_hut_open_s.lzsa echo "arrival_e_lzsa: .incbin \"arrival_e.lzsa\"" > arbor_graphics.inc echo "arrival_open_e_lzsa: .incbin \"arrival_open_e.lzsa\"" >> arbor_graphics.inc echo "arrival_w_lzsa: .incbin \"arrival_w.lzsa\"" >> arbor_graphics.inc @@ -41,6 +45,16 @@ arbor_graphics.inc: \ echo "longshack2_w_lzsa: .incbin \"longshack2_w.lzsa\"" >> arbor_graphics.inc echo "longshack2_n_lzsa: .incbin \"longshack2_n.lzsa\"" >> arbor_graphics.inc echo "longshack2_s_lzsa: .incbin \"longshack2_s.lzsa\"" >> arbor_graphics.inc + echo "switch_bridge1_n_lzsa: .incbin \"switch_bridge1_n.lzsa\"" >> arbor_graphics.inc + echo "switch_bridge1_s_lzsa: .incbin \"switch_bridge1_s.lzsa\"" >> arbor_graphics.inc + echo "switch_hut1_n_lzsa: .incbin \"switch_hut1_n.lzsa\"" >> arbor_graphics.inc + echo "switch_hut1_e_lzsa: .incbin \"switch_hut1_e.lzsa\"" >> arbor_graphics.inc + echo "switch_bridge2_e_lzsa: .incbin \"switch_bridge2_e.lzsa\"" >> arbor_graphics.inc + echo "switch_bridge2_w_lzsa: .incbin \"switch_bridge2_w.lzsa\"" >> arbor_graphics.inc + echo "switch_hut_w_lzsa: .incbin \"switch_hut_w.lzsa\"" >> arbor_graphics.inc + echo "switch_hut_closed_s_lzsa: .incbin \"switch_hut_closed_s.lzsa\"" >> arbor_graphics.inc + echo "switch_hut_open_s_lzsa: .incbin \"switch_hut_open_s.lzsa\"" >> arbor_graphics.inc + %.gr: %.png $(PNG2GR) $< $@ diff --git a/mist/graphics_arbor/switch_bridge1_n.png b/mist/graphics_arbor/switch_bridge1_n.png new file mode 100644 index 0000000000000000000000000000000000000000..04f96baecc650f8e1d02ff45e8277195acac2ab1 GIT binary patch literal 1086 zcmV-E1i|}>P)EX>4Tx04R}tkv&MmKpe$iTeTv!3U&~2$WWauh>CR7DionYs1;guFuC+YXws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;lcSTOi%KKJM7Rq`eSd;;+d(+!Jwop^fF z(mC%FM_5Txh|h_~47wokBiCh@-#8Z?_Vdh$kx9=HM~H=D8_R9XN`^{2MI2RBjq?3j zmle)ioYiubHSft^7|LtQOI)Wpj3gGY2oVBgRI!0FEW~KlNHLM7{e*{q$nlHhlF79J zMvi$@ph9x|;D7MDTeC1Z;Ut6afwi_oq2Q0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJ zAV*0}P*;Ht7XSbO=t)FDR7l6omeG#HAP7Z$s9GoS|9^LTr6^jkcDIu($#f#Z5m8aM zza}wy@0|Ppz}QJqoszRtrRWb^ZhN1zFH)M;c=?dk9?}qP0<48^=NG%YgC}V zWoN+V*#S9h`{?OFbKB^#=|DO36gV#qFwIr8OiqDgA=owoa;YB^gyX5^P^%>b+&1sG ztwlK6C_p=h&H;$8j8IEU1;#kbp>|1K51#k+n!f|C)F9pk=dA~zUWx4p`{KnptQV*} zD|h8y?nB-{Ch&O<+n@qCui5uH<=v3d?3Hkh&`L}9T47}f*aV+XN+D3};S}gu=N#H- zd9S`~01N>Ta)eoPhTHj6JI~e8C_wB%ngu-Fii|+{-`iEKwICeP2-I!GFmC`mBqyCR z7|Pj13q3uMzr1+(!Hbux1M&uuDJCPjNXM@ZoIHvDAp6U51AHFBFMxBTYb%U%$th-? z?nL{5Y{^TU6L#i~2DGaX0jc=&&;lsq>w(rnvV{ix0k^tfXjb%NumAu607*qoM6N<$ Eg5f>$)c^nh literal 0 HcmV?d00001 diff --git a/mist/graphics_arbor/switch_bridge1_s.png b/mist/graphics_arbor/switch_bridge1_s.png new file mode 100644 index 0000000000000000000000000000000000000000..958ee18f93bf3a2d2cba750706230896f9402ee7 GIT binary patch literal 1208 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 IM6N<$f`Nrgw*UYD literal 0 HcmV?d00001 diff --git a/mist/graphics_arbor/switch_hut1_e.png b/mist/graphics_arbor/switch_hut1_e.png new file mode 100644 index 0000000000000000000000000000000000000000..24309b760400d89ae5c5b3672a9061ccfcef27e3 GIT binary patch literal 1180 zcmV;N1Y`S&P)EX>4Tx04R}tkv&MmKpe$iTeTv!3U&~2$WWauh>CR7DionYs1;guFuC+YXws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;lcSTOi%KKJM7Rq`eSd;;+d(+!Jwop^fF z(mC%FM_5Txh|h_~47wokBiCh@-#8Z?_Vdh$kx9=HM~H=D8_R9XN`^{2MI2RBjq?3j zmle)ioYiubHSft^7|LtQOI)Wpj3gGY2oVBgRI!0FEW~KlNHLM7{e*{q$nlHhlF79J zMvi$@ph9x|;D7MDTeC1Z;Ut6&4B#s~3N70000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJ zAV*0}P*;Ht7XSbPMoC0LR7l6Img$niAPj@^Cs${9|JU6rsw$f!$L@NjBqh!l%Yb2; zrfr+1^=#2UD5aKwD7ffyLHOaMO0&t^sw zVGpS1MgzzQIZSAk+YXR3p0Q=1?=mnBRs)o&bYW;BlF3K!gB*ICHL>}sfq77j9Y`(( z&XmmvT^vS0fA$hcOg}>B@Vor3fo-j+ffqS!fvz^Z638}Ao12m;g~h=@c(%Yngq$`R z=&j0=3qE?gBfc%?aTBFr0sAXu0A%U+)V37uF$OY1$sOd7MJq-ar-dSpz#A(i1635F z^&%Wrn;IA`OLh)VC2Mz%Ko{4?D+P|PR|GDLp#4$4k;4q+ZsWxV;PN)Kmn(()N|r33 z?oqKL(0S|v;n)H_Ae^l=a44BTNM07;(0cncuoMBI=rTh7GSJ7lQu66bGvGE5y)I;9 zVCOhTpz@P}+MV0;;bR~&MIhlVkkA3pQ$j!;L%1MEC)k@2681TU9P8VNQrSZw;-lmi z;|~la^StHbh;R{D$9Wnd96id$MJpZa0{I{xn2al3JCV#ukR_kv)ZdYu9RwVURIi^j u5!$r{wjEX>4Tx04R}tkv&MmKpe$iTeTv!3U&~2$WWauh>CR7DionYs1;guFuC+YXws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;lcSTOi%KKJM7Rq`eSd;;+d(+!Jwop^fF z(mC%FM_5Txh|h_~47wokBiCh@-#8Z?_Vdh$kx9=HM~H=D8_R9XN`^{2MI2RBjq?3j zmle)ioYiubHSft^7|LtQOI)Wpj3gGY2oVBgRI!0FEW~KlNHLM7{e*{q$nlHhlF79J zMvi$@ph9x|;D7MDTeC1Z;Ut6bBmvBuYy80000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJ zAV*0}P*;Ht7XSbPa7jc#R7l62m)&;5APj@KC{22i_kZ10(=^%UXX!X6EKT5xWgEj< z`)OxruXk&q;R!Fj#r<)hzb;+u+aBmAx?Zp2=zRq0ZV5ck@e{`U6%SG&_0YfOO8N3`2_+Nf#~IeJ3yt*(n4ez{1_!ypguOWa0ZNVCk$c9p|}BL z!g5-atkeQD17j`@Knmhl9T)%s*J$M@M@4)IiaaDBdP&CL=tEcxD7{Trlqh?+B)eo` zLUoj0dhlwE)UE#+%nKx05Ae7 zE34#*;F*Pa3lLE2rveq6B@kEKr1)e9ocPeo%|{VSj+W1XEgyV$=fhYuJ^(7V^8;r- zAV(PHZGaW92Wn35OUeHQmMF(5tSS{aPi#VUj9vgaOx4fTW(8z^qAh_DT<^y6mDl-^3OC k##+w*4(c~7iugJ33rAUIliM%1A^-pY07*qoM6N<$g7J4DRsaA1 literal 0 HcmV?d00001 diff --git a/mist/graphics_arbor/switch_hut_closed_s.png b/mist/graphics_arbor/switch_hut_closed_s.png new file mode 100644 index 0000000000000000000000000000000000000000..4cd6a4edc646a52b4f9e2409c3b0113f8e8943d7 GIT binary patch literal 1192 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 LNkvXXu0mjfAch`m literal 0 HcmV?d00001 diff --git a/mist/leveldata_arbor.inc b/mist/leveldata_arbor.inc index c817e7e1..859afdcb 100644 --- a/mist/leveldata_arbor.inc +++ b/mist/leveldata_arbor.inc @@ -5,7 +5,8 @@ locations: .word location0, location1, location2, location3 .word location4, location5, location6, location7 - .word location8, location9, location10 + .word location8, location9, location10,location11 + .word location12,location13,location14 ; ARBOR_INSIDE_ELEV1 -- arrival in elevator1 @@ -187,11 +188,11 @@ location9: ; ARBOR_LONGSHACK2 -- extra long shack part 2 location10: .byte $ff ; north exit - .byte $ff ; south exit + .byte ARBOR_SWITCH_BRIDGE1 ; south exit .byte $ff ; east exit .byte ARBOR_LONGSHACK1 ; west exit .byte $ff ; north exit_dir - .byte $ff ; south exit_dir + .byte DIRECTION_S ; south exit_dir .byte $ff ; east exit_dir .byte DIRECTION_W ; west exit_dir .word longshack2_n_lzsa ; north bg @@ -201,3 +202,74 @@ location10: .byte BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST .byte $ff +; ARBOR_SWITCH_BRIDGE1 -- first bridge leading to switch +location11: + .byte ARBOR_LONGSHACK2 ; north exit + .byte ARBOR_SWITCH_HUT1 ; south exit + .byte $ff ; east exit + .byte $ff ; west exit + .byte DIRECTION_N ; north exit_dir + .byte DIRECTION_E ; south exit_dir + .byte $ff ; east exit_dir + .byte $ff ; west exit_dir + .word switch_bridge1_n_lzsa ; north bg + .word switch_bridge1_s_lzsa ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_SOUTH + .byte $ff + +; ARBOR_SWITCH_HUT1 -- first hut on way to switch +location12: + .byte ARBOR_SWITCH_BRIDGE1 ; north exit + .byte $ff ; south exit + .byte ARBOR_SWITCH_BRIDGE2 ; east exit + .byte $ff ; west exit + .byte DIRECTION_N ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_E ; east exit_dir + .byte $ff ; west exit_dir + .word switch_hut1_n_lzsa ; north bg + .word $0000 ; south bg + .word switch_hut1_e_lzsa ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_EAST + .byte $ff + +; ARBOR_SWITCH_BRIDGE2 -- second bridge on way to switch +location13: + .byte $ff ; north exit + .byte $ff ; south exit + .byte ARBOR_SWITCH_HUT ; east exit + .byte ARBOR_SWITCH_HUT1 ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_S ; east exit_dir + .byte DIRECTION_N ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word switch_bridge2_e_lzsa ; east bg + .word switch_bridge2_w_lzsa ; west bg + .byte BG_WEST|BG_EAST + .byte $ff + +; ARBOR_SWITCH_HUT -- hut with hard-to-find switch +location14: + .byte $ff ; north exit + .byte $ff ; south exit + .byte $ff ; east exit + .byte ARBOR_SWITCH_BRIDGE2 ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte $ff ; east exit_dir + .byte DIRECTION_W ; west exit_dir + .word $0000 ; north bg + .word switch_hut_closed_s_lzsa; south bg + .word $0000 ; east bg + .word switch_hut_w_lzsa ; west bg + .byte BG_WEST|BG_SOUTH + .byte DIRECTION_S ; special exit + .byte 16,22 ; special x + .byte 28,40 ; special y + .word hut_handle-1 ; special function + diff --git a/mist/zp.inc b/mist/zp.inc index 655bc8f1..c92b1c65 100644 --- a/mist/zp.inc +++ b/mist/zp.inc @@ -139,6 +139,7 @@ CHANNEL_SWITCHES= $B5 CHANNEL_BRIDGE_UP = $01 CHANNEL_PIPE_EXTENDED = $02 CHANNEL_BOOK_ELEVATOR_UP= $04 + CHANNEL_SW_GATE_TOP = $08 CHANNEL_SW_WINDMILL = $40 CHANNEL_SW_FAUCET = $80 CHANNEL_VALVES = $B6