From 29bb05412832347d84b9a8d23f12ff2669f0b82e Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Mon, 10 Aug 2020 12:58:54 -0400 Subject: [PATCH] mist: stoney: can open the trunk now --- mist/graphics_stoney/Makefile | 2 + .../lighthouse_inside_lidup_n.png | Bin 0 -> 14526 bytes mist/stoney_puzzles.s | 57 +++++++++++++++++- mist/zp.inc | 3 +- 4 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 mist/graphics_stoney/lighthouse_inside_lidup_n.png diff --git a/mist/graphics_stoney/Makefile b/mist/graphics_stoney/Makefile index d8a14f56..a0f2e780 100644 --- a/mist/graphics_stoney/Makefile +++ b/mist/graphics_stoney/Makefile @@ -17,6 +17,7 @@ stoney_graphics.inc: \ lighthouse_inside_e.lzsa lighthouse_inside_w.lzsa \ lighthouse_inside_n.lzsa \ lighthouse_inside_nowater_n.lzsa lighthouse_inside_notrunk_n.lzsa \ + lighthouse_inside_lidup_n.lzsa \ lighthouse_upstairs_e.lzsa lighthouse_upstairs_w.lzsa \ lighthouse_battery_w.lzsa \ lighthouse_downladder_e.lzsa \ @@ -70,6 +71,7 @@ stoney_graphics.inc: \ echo "lighthouse_inside_n_lzsa: .incbin \"lighthouse_inside_n.lzsa\"" >> stoney_graphics.inc echo "lighthouse_inside_nowater_n_lzsa: .incbin \"lighthouse_inside_nowater_n.lzsa\"" >> stoney_graphics.inc echo "lighthouse_inside_notrunk_n_lzsa: .incbin \"lighthouse_inside_notrunk_n.lzsa\"" >> stoney_graphics.inc + echo "lighthouse_inside_lidup_n_lzsa: .incbin \"lighthouse_inside_lidup_n.lzsa\"" >> stoney_graphics.inc echo "lighthouse_upstairs_e_lzsa: .incbin \"lighthouse_upstairs_e.lzsa\"" >> stoney_graphics.inc echo "lighthouse_upstairs_w_lzsa: .incbin \"lighthouse_upstairs_w.lzsa\"" >> stoney_graphics.inc echo "lighthouse_battery_w_lzsa: .incbin \"lighthouse_battery_w.lzsa\"" >> stoney_graphics.inc diff --git a/mist/graphics_stoney/lighthouse_inside_lidup_n.png b/mist/graphics_stoney/lighthouse_inside_lidup_n.png new file mode 100644 index 0000000000000000000000000000000000000000..68cfd2a9dabc8427b18820e01b4839832baa7a5f GIT binary patch literal 14526 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 zcw(%z*lighthouse_inside_n_lzsa sta location5+1,Y ; STONEY_LIGHTHOUSE_INSIDE + jmp done_draw_trunk + +draw_trunk_open: + lda #lighthouse_inside_lidup_n_lzsa + sta location5+1,Y ; STONEY_LIGHTHOUSE_INSIDE done_draw_trunk: - - lda PUMP_STATE beq done_update_pump_state cmp #DRAINED_EXIT @@ -1596,6 +1607,21 @@ start_key_animation: rts inside_other: + + ; if water-up-not-open do nothing + ; if water-down, go down steps + ; if water-up-open - grab key + + lda PUMP_STATE + cmp #DRAINED_LIGHTHOUSE + bne inside_water_up +inside_and_drained: + lda #STONEY_LIGHTHOUSE_SPIRAL + sta LOCATION + jmp change_location +inside_water_up: + + rts rotate_to_ladder: @@ -1646,9 +1672,29 @@ looking_toward_trunk: cmp #8 bne done_draw_inside_lighthouse + ; done animating lda #0 sta ANIMATE_FRAME + ; open trunk but only if trunk is up + ; so if TRUNK_STATE & TRUNK_WATER_DRAINED = 1 + ; and PUMP_STATE & DRAINED_LIGHTHOUSE = 0 + lda PUMP_STATE + and #DRAINED_LIGHTHOUSE + bne dont_open_trunk + + lda TRUNK_STATE + and #TRUNK_WATER_DRAINED + beq dont_open_trunk + + lda TRUNK_STATE + ora #TRUNK_LID_OPEN + sta TRUNK_STATE + + ; actually change background + jsr update_pump_state + jsr change_direction +dont_open_trunk: done_draw_inside_lighthouse: rts @@ -1714,3 +1760,10 @@ key_frame5_sprite: .byte $AA,$AA,$A0,$00,$0A,$0A,$A0 + ; at 16,30 +trunk_key_sprite: + .byte 5,2 + .byte $AA,$AA,$AA,$0A,$0A + .byte $00,$A0,$A0,$00,$A0 + + diff --git a/mist/zp.inc b/mist/zp.inc index 31c075bb..d2d1e862 100644 --- a/mist/zp.inc +++ b/mist/zp.inc @@ -244,7 +244,8 @@ TRUNK_STATE = $C9 ; trunk state in stonsehip TRUNK_VALVE_OPEN = $01 TRUNK_WATER_DRAINED = $02 TRUNK_KEY_TAKEN = $04 - TRUNK_HATCH_OPEN = $08 + TRUNK_LID_OPEN = $08 + TRUNK_HATCH_OPEN = $10 SELENA_BUTTON_STATUS = $CA SELENA_BUTTON1 = $01 ; POOL (water)