diff --git a/mist/clock_bridge_puzzle.s b/mist/clock_bridge_puzzle.s index 07ac0b0d..310d0425 100644 --- a/mist/clock_bridge_puzzle.s +++ b/mist/clock_bridge_puzzle.s @@ -308,6 +308,10 @@ done_clock_bridge: draw_clock_face: + lda DIRECTION + cmp #DIRECTION_S + bne done_draw_clock_face + lda CLOCK_HOUR asl tay @@ -335,6 +339,7 @@ draw_clock_face: lda #6 sta YPOS jsr put_sprite_crop +done_draw_clock_face: rts diff --git a/mist/graphics_mist/Makefile b/mist/graphics_mist/Makefile index 885ef327..39fa1443 100644 --- a/mist/graphics_mist/Makefile +++ b/mist/graphics_mist/Makefile @@ -21,7 +21,7 @@ mist_graphics.inc: \ step_land3_w.lzsa step_land3_e.lzsa \ step_top_e.lzsa step_top_w.lzsa step_top_n.lzsa step_top_s.lzsa \ pool_s.lzsa \ - clock_s.lzsa clock_bridge.lzsa \ + clock_e.lzsa clock_s.lzsa clock_bridge.lzsa \ spaceship_far_e.lzsa spaceship_far_n.lzsa \ tree2_n.lzsa \ tree5_n.lzsa tree5_e.lzsa tree5_s.lzsa \ @@ -76,6 +76,7 @@ mist_graphics.inc: \ echo "step_top_s_lzsa: .incbin \"step_top_s.lzsa\"" >> mist_graphics.inc echo "pool_s_lzsa: .incbin \"pool_s.lzsa\"" >> mist_graphics.inc echo "clock_s_lzsa: .incbin \"clock_s.lzsa\"" >> mist_graphics.inc + echo "clock_e_lzsa: .incbin \"clock_e.lzsa\"" >> mist_graphics.inc echo "clock_bridge_lzsa: .incbin \"clock_bridge.lzsa\"" >> mist_graphics.inc echo "spaceship_far_n_lzsa: .incbin \"spaceship_far_n.lzsa\"" >> mist_graphics.inc echo "spaceship_far_e_lzsa: .incbin \"spaceship_far_e.lzsa\"" >> mist_graphics.inc diff --git a/mist/graphics_mist/clock_e.png b/mist/graphics_mist/clock_e.png new file mode 100644 index 00000000..feb3ab9e Binary files /dev/null and b/mist/graphics_mist/clock_e.png differ diff --git a/mist/graphics_mist/mist_graphics.inc b/mist/graphics_mist/mist_graphics.inc index 5c6cf6f0..13e9152b 100644 --- a/mist/graphics_mist/mist_graphics.inc +++ b/mist/graphics_mist/mist_graphics.inc @@ -26,6 +26,7 @@ step_top_n_lzsa: .incbin "step_top_n.lzsa" step_top_s_lzsa: .incbin "step_top_s.lzsa" pool_s_lzsa: .incbin "pool_s.lzsa" clock_s_lzsa: .incbin "clock_s.lzsa" +clock_e_lzsa: .incbin "clock_e.lzsa" clock_bridge_lzsa: .incbin "clock_bridge.lzsa" spaceship_far_n_lzsa: .incbin "spaceship_far_n.lzsa" spaceship_far_e_lzsa: .incbin "spaceship_far_e.lzsa" diff --git a/mist/leveldata_mist.inc b/mist/leveldata_mist.inc index f8d50a45..7bb13084 100644 --- a/mist/leveldata_mist.inc +++ b/mist/leveldata_mist.inc @@ -232,10 +232,13 @@ location11: .byte $ff ; west exit_dir .word $0000 ; north bg .word clock_s_lzsa ; south bg - .word $0000 ; east bg + .word clock_e_lzsa ; east bg .word $0000 ; west bg - .byte BG_SOUTH - .byte $ff ; special exit + .byte BG_SOUTH|BG_EAST + .byte DIRECTION_E ; special exit + .byte 9,29 ; special x + .byte 2,46 ; special y + .word enter_channel_clock-1 ; special function ; MIST_SPACESHIP_FAR -- spaceship far location12: