diff --git a/mist/Makefile b/mist/Makefile index 1bc7e88a..96f87a41 100644 --- a/mist/Makefile +++ b/mist/Makefile @@ -46,7 +46,7 @@ MIST: mist.o ld65 -o MIST mist.o -C ../linker_scripts/apple2_1400.inc mist.o: mist.s zp.inc hardware.inc \ - graphics_island/mist_graphics.inc \ + graphics_mist/mist_graphics.inc \ common_sprites.inc \ leveldata_mist.inc \ clock_bridge_puzzle.s clock_sprites.inc \ diff --git a/mist/generator_puzzle.s b/mist/generator_puzzle.s index 7f3f1845..7fbe0355 100644 --- a/mist/generator_puzzle.s +++ b/mist/generator_puzzle.s @@ -1,3 +1,28 @@ +;======================= +; flip circuit breaker + +; if room==42, and with #$fe +; if room==??, and with #$fd + +circuit_breaker: + + lda LOCATION + cmp #42 + bne other_circuit_breaker + + lda BREAKER_TRIPPED + and #$fe + jmp done_circuit_breaker + +other_circuit_breaker: + lda BREAKER_TRIPPED + and #$fd + +done_circuit_breaker: + sta BREAKER_TRIPPED + rts + + ;====================== ; open the spaceship door diff --git a/mist/graphics_island/Makefile b/mist/graphics_mist/Makefile similarity index 95% rename from mist/graphics_island/Makefile rename to mist/graphics_mist/Makefile index 46aa041c..ed31eb22 100644 --- a/mist/graphics_island/Makefile +++ b/mist/graphics_mist/Makefile @@ -51,7 +51,9 @@ mist_graphics.inc: \ gen_door_closed_n.lzsa gen_door_open_n.lzsa gen_door_s.lzsa \ green_steps6_n.lzsa green_steps6_w.lzsa \ pad_n.lzsa pad_e.lzsa \ - spaceship_door_n.lzsa spaceship_door_open_n.lzsa + spaceship_door_n.lzsa spaceship_door_open_n.lzsa \ + tower2_base_w.lzsa tower2_top_w.lzsa \ + tower2_path_e.lzsa tower2_path_n.lzsa echo "m_link_book_lzsa: .incbin \"m_link_book.lzsa\"" > mist_graphics.inc echo "dock_n_lzsa: .incbin \"dock_n.lzsa\"" >> mist_graphics.inc echo "dock_s_lzsa: .incbin \"dock_s.lzsa\"" >> mist_graphics.inc @@ -138,6 +140,10 @@ mist_graphics.inc: \ echo "pad_e_lzsa: .incbin \"pad_e.lzsa\"" >> mist_graphics.inc echo "spaceship_door_n_lzsa: .incbin \"spaceship_door_n.lzsa\"" >> mist_graphics.inc echo "spaceship_door_open_n_lzsa: .incbin \"spaceship_door_open_n.lzsa\"" >> mist_graphics.inc + echo "tower2_base_w_lzsa: .incbin \"tower2_base_w.lzsa\"" >> mist_graphics.inc + echo "tower2_top_w_lzsa: .incbin \"tower2_top_w.lzsa\"" >> mist_graphics.inc + echo "tower2_path_e_lzsa: .incbin \"tower2_path_e.lzsa\"" >> mist_graphics.inc + echo "tower2_path_n_lzsa: .incbin \"tower2_path_n.lzsa\"" >> mist_graphics.inc %.gr: %.png diff --git a/mist/graphics_island/Makefile.orig b/mist/graphics_mist/Makefile.orig similarity index 100% rename from mist/graphics_island/Makefile.orig rename to mist/graphics_mist/Makefile.orig diff --git a/mist/graphics_island/above_dock_e.png b/mist/graphics_mist/above_dock_e.png similarity index 100% rename from mist/graphics_island/above_dock_e.png rename to mist/graphics_mist/above_dock_e.png diff --git a/mist/graphics_island/above_dock_n.png b/mist/graphics_mist/above_dock_n.png similarity index 100% rename from mist/graphics_island/above_dock_n.png rename to mist/graphics_mist/above_dock_n.png diff --git a/mist/graphics_island/above_dock_s.png b/mist/graphics_mist/above_dock_s.png similarity index 100% rename from mist/graphics_island/above_dock_s.png rename to mist/graphics_mist/above_dock_s.png diff --git a/mist/graphics_island/chair_view_n.png b/mist/graphics_mist/chair_view_n.png similarity index 100% rename from mist/graphics_island/chair_view_n.png rename to mist/graphics_mist/chair_view_n.png diff --git a/mist/graphics_island/chair_view_s.png b/mist/graphics_mist/chair_view_s.png similarity index 100% rename from mist/graphics_island/chair_view_s.png rename to mist/graphics_mist/chair_view_s.png diff --git a/mist/graphics_island/clock_bridge.png b/mist/graphics_mist/clock_bridge.png similarity index 100% rename from mist/graphics_island/clock_bridge.png rename to mist/graphics_mist/clock_bridge.png diff --git a/mist/graphics_island/clock_inside_open.png b/mist/graphics_mist/clock_inside_open.png similarity index 100% rename from mist/graphics_island/clock_inside_open.png rename to mist/graphics_mist/clock_inside_open.png diff --git a/mist/graphics_island/clock_inside_s.png b/mist/graphics_mist/clock_inside_s.png similarity index 100% rename from mist/graphics_island/clock_inside_s.png rename to mist/graphics_mist/clock_inside_s.png diff --git a/mist/graphics_island/clock_island_n.png b/mist/graphics_mist/clock_island_n.png similarity index 100% rename from mist/graphics_island/clock_island_n.png rename to mist/graphics_mist/clock_island_n.png diff --git a/mist/graphics_island/clock_island_s.png b/mist/graphics_mist/clock_island_s.png similarity index 100% rename from mist/graphics_island/clock_island_s.png rename to mist/graphics_mist/clock_island_s.png diff --git a/mist/graphics_island/clock_puzzle_bridge.png b/mist/graphics_mist/clock_puzzle_bridge.png similarity index 100% rename from mist/graphics_island/clock_puzzle_bridge.png rename to mist/graphics_mist/clock_puzzle_bridge.png diff --git a/mist/graphics_island/clock_puzzle_s.png b/mist/graphics_mist/clock_puzzle_s.png similarity index 100% rename from mist/graphics_island/clock_puzzle_s.png rename to mist/graphics_mist/clock_puzzle_s.png diff --git a/mist/graphics_island/clock_s.png b/mist/graphics_mist/clock_s.png similarity index 100% rename from mist/graphics_island/clock_s.png rename to mist/graphics_mist/clock_s.png diff --git a/mist/graphics_island/dentist_door_n.png b/mist/graphics_mist/dentist_door_n.png similarity index 100% rename from mist/graphics_island/dentist_door_n.png rename to mist/graphics_mist/dentist_door_n.png diff --git a/mist/graphics_island/dentist_door_s.png b/mist/graphics_mist/dentist_door_s.png similarity index 100% rename from mist/graphics_island/dentist_door_s.png rename to mist/graphics_mist/dentist_door_s.png diff --git a/mist/graphics_island/dock_e.png b/mist/graphics_mist/dock_e.png similarity index 100% rename from mist/graphics_island/dock_e.png rename to mist/graphics_mist/dock_e.png diff --git a/mist/graphics_island/dock_n.png b/mist/graphics_mist/dock_n.png similarity index 100% rename from mist/graphics_island/dock_n.png rename to mist/graphics_mist/dock_n.png diff --git a/mist/graphics_island/dock_s.png b/mist/graphics_mist/dock_s.png similarity index 100% rename from mist/graphics_island/dock_s.png rename to mist/graphics_mist/dock_s.png diff --git a/mist/graphics_island/dock_steps_w.png b/mist/graphics_mist/dock_steps_w.png similarity index 100% rename from mist/graphics_island/dock_steps_w.png rename to mist/graphics_mist/dock_steps_w.png diff --git a/mist/graphics_island/dock_switch_n.png b/mist/graphics_mist/dock_switch_n.png similarity index 100% rename from mist/graphics_island/dock_switch_n.png rename to mist/graphics_mist/dock_switch_n.png diff --git a/mist/graphics_island/dock_switch_s.png b/mist/graphics_mist/dock_switch_s.png similarity index 100% rename from mist/graphics_island/dock_switch_s.png rename to mist/graphics_mist/dock_switch_s.png diff --git a/mist/graphics_island/dock_w.png b/mist/graphics_mist/dock_w.png similarity index 100% rename from mist/graphics_island/dock_w.png rename to mist/graphics_mist/dock_w.png diff --git a/mist/graphics_island/fireplace_e.png b/mist/graphics_mist/fireplace_e.png similarity index 100% rename from mist/graphics_island/fireplace_e.png rename to mist/graphics_mist/fireplace_e.png diff --git a/mist/graphics_island/gear_base_n.png b/mist/graphics_mist/gear_base_n.png similarity index 100% rename from mist/graphics_island/gear_base_n.png rename to mist/graphics_mist/gear_base_n.png diff --git a/mist/graphics_island/gear_n.png b/mist/graphics_mist/gear_n.png similarity index 100% rename from mist/graphics_island/gear_n.png rename to mist/graphics_mist/gear_n.png diff --git a/mist/graphics_island/gear_open_e.png b/mist/graphics_mist/gear_open_e.png similarity index 100% rename from mist/graphics_island/gear_open_e.png rename to mist/graphics_mist/gear_open_e.png diff --git a/mist/graphics_island/gear_open_n.png b/mist/graphics_mist/gear_open_n.png similarity index 100% rename from mist/graphics_island/gear_open_n.png rename to mist/graphics_mist/gear_open_n.png diff --git a/mist/graphics_island/gear_s.png b/mist/graphics_mist/gear_s.png similarity index 100% rename from mist/graphics_island/gear_s.png rename to mist/graphics_mist/gear_s.png diff --git a/mist/graphics_island/gear_w.png b/mist/graphics_mist/gear_w.png similarity index 100% rename from mist/graphics_island/gear_w.png rename to mist/graphics_mist/gear_w.png diff --git a/mist/graphics_island/gen_door_closed_n.png b/mist/graphics_mist/gen_door_closed_n.png similarity index 100% rename from mist/graphics_island/gen_door_closed_n.png rename to mist/graphics_mist/gen_door_closed_n.png diff --git a/mist/graphics_island/gen_door_open_n.png b/mist/graphics_mist/gen_door_open_n.png similarity index 100% rename from mist/graphics_island/gen_door_open_n.png rename to mist/graphics_mist/gen_door_open_n.png diff --git a/mist/graphics_island/gen_door_s.png b/mist/graphics_mist/gen_door_s.png similarity index 100% rename from mist/graphics_island/gen_door_s.png rename to mist/graphics_mist/gen_door_s.png diff --git a/mist/graphics_island/generator_n.png b/mist/graphics_mist/generator_n.png similarity index 100% rename from mist/graphics_island/generator_n.png rename to mist/graphics_mist/generator_n.png diff --git a/mist/graphics_island/generator_s.png b/mist/graphics_mist/generator_s.png similarity index 100% rename from mist/graphics_island/generator_s.png rename to mist/graphics_mist/generator_s.png diff --git a/mist/graphics_island/green_house_e.png b/mist/graphics_mist/green_house_e.png similarity index 100% rename from mist/graphics_island/green_house_e.png rename to mist/graphics_mist/green_house_e.png diff --git a/mist/graphics_island/green_house_w.png b/mist/graphics_mist/green_house_w.png similarity index 100% rename from mist/graphics_island/green_house_w.png rename to mist/graphics_mist/green_house_w.png diff --git a/mist/graphics_island/green_steps1_n.png b/mist/graphics_mist/green_steps1_n.png similarity index 100% rename from mist/graphics_island/green_steps1_n.png rename to mist/graphics_mist/green_steps1_n.png diff --git a/mist/graphics_island/green_steps1_s.png b/mist/graphics_mist/green_steps1_s.png similarity index 100% rename from mist/graphics_island/green_steps1_s.png rename to mist/graphics_mist/green_steps1_s.png diff --git a/mist/graphics_island/green_steps6_n.png b/mist/graphics_mist/green_steps6_n.png similarity index 100% rename from mist/graphics_island/green_steps6_n.png rename to mist/graphics_mist/green_steps6_n.png diff --git a/mist/graphics_island/green_steps6_w.png b/mist/graphics_mist/green_steps6_w.png similarity index 100% rename from mist/graphics_island/green_steps6_w.png rename to mist/graphics_mist/green_steps6_w.png diff --git a/mist/graphics_island/in_fireplace_door.png b/mist/graphics_mist/in_fireplace_door.png similarity index 100% rename from mist/graphics_island/in_fireplace_door.png rename to mist/graphics_mist/in_fireplace_door.png diff --git a/mist/graphics_island/in_fireplace_w.png b/mist/graphics_mist/in_fireplace_w.png similarity index 100% rename from mist/graphics_island/in_fireplace_w.png rename to mist/graphics_mist/in_fireplace_w.png diff --git a/mist/graphics_island/m_link_book.png b/mist/graphics_mist/m_link_book.png similarity index 100% rename from mist/graphics_island/m_link_book.png rename to mist/graphics_mist/m_link_book.png diff --git a/mist/graphics_island/mist_graphics.inc b/mist/graphics_mist/mist_graphics.inc similarity index 95% rename from mist/graphics_island/mist_graphics.inc rename to mist/graphics_mist/mist_graphics.inc index 70c76732..b9b1e934 100644 --- a/mist/graphics_island/mist_graphics.inc +++ b/mist/graphics_mist/mist_graphics.inc @@ -84,3 +84,7 @@ pad_n_lzsa: .incbin "pad_n.lzsa" pad_e_lzsa: .incbin "pad_e.lzsa" spaceship_door_n_lzsa: .incbin "spaceship_door_n.lzsa" spaceship_door_open_n_lzsa: .incbin "spaceship_door_open_n.lzsa" +tower2_base_w_lzsa: .incbin "tower2_base_w.lzsa" +tower2_top_w_lzsa: .incbin "tower2_top_w.lzsa" +tower2_path_e_lzsa: .incbin "tower2_path_e.lzsa" +tower2_path_n_lzsa: .incbin "tower2_path_n.lzsa" diff --git a/mist/graphics_island/pad_e.png b/mist/graphics_mist/pad_e.png similarity index 100% rename from mist/graphics_island/pad_e.png rename to mist/graphics_mist/pad_e.png diff --git a/mist/graphics_island/pad_n.png b/mist/graphics_mist/pad_n.png similarity index 100% rename from mist/graphics_island/pad_n.png rename to mist/graphics_mist/pad_n.png diff --git a/mist/graphics_island/pool_s.png b/mist/graphics_mist/pool_s.png similarity index 100% rename from mist/graphics_island/pool_s.png rename to mist/graphics_mist/pool_s.png diff --git a/mist/graphics_island/red_book_closed.png b/mist/graphics_mist/red_book_closed.png similarity index 100% rename from mist/graphics_island/red_book_closed.png rename to mist/graphics_mist/red_book_closed.png diff --git a/mist/graphics_island/red_book_open.png b/mist/graphics_mist/red_book_open.png similarity index 100% rename from mist/graphics_island/red_book_open.png rename to mist/graphics_mist/red_book_open.png diff --git a/mist/graphics_island/red_book_shelf.png b/mist/graphics_mist/red_book_shelf.png similarity index 100% rename from mist/graphics_island/red_book_shelf.png rename to mist/graphics_mist/red_book_shelf.png diff --git a/mist/graphics_island/red_book_static.png b/mist/graphics_mist/red_book_static.png similarity index 100% rename from mist/graphics_island/red_book_static.png rename to mist/graphics_mist/red_book_static.png diff --git a/mist/graphics_island/red_book_static2.png b/mist/graphics_mist/red_book_static2.png similarity index 100% rename from mist/graphics_island/red_book_static2.png rename to mist/graphics_mist/red_book_static2.png diff --git a/mist/graphics_island/spaceship_door_n.png b/mist/graphics_mist/spaceship_door_n.png similarity index 100% rename from mist/graphics_island/spaceship_door_n.png rename to mist/graphics_mist/spaceship_door_n.png diff --git a/mist/graphics_island/spaceship_door_open_n.png b/mist/graphics_mist/spaceship_door_open_n.png similarity index 100% rename from mist/graphics_island/spaceship_door_open_n.png rename to mist/graphics_mist/spaceship_door_open_n.png diff --git a/mist/graphics_island/spaceship_far_e.png b/mist/graphics_mist/spaceship_far_e.png similarity index 100% rename from mist/graphics_island/spaceship_far_e.png rename to mist/graphics_mist/spaceship_far_e.png diff --git a/mist/graphics_island/spaceship_far_n.png b/mist/graphics_mist/spaceship_far_n.png similarity index 100% rename from mist/graphics_island/spaceship_far_n.png rename to mist/graphics_mist/spaceship_far_n.png diff --git a/mist/graphics_island/spaceship_switch_n.png b/mist/graphics_mist/spaceship_switch_n.png similarity index 100% rename from mist/graphics_island/spaceship_switch_n.png rename to mist/graphics_mist/spaceship_switch_n.png diff --git a/mist/graphics_island/step_base_n.png b/mist/graphics_mist/step_base_n.png similarity index 100% rename from mist/graphics_island/step_base_n.png rename to mist/graphics_mist/step_base_n.png diff --git a/mist/graphics_island/step_base_s.png b/mist/graphics_mist/step_base_s.png similarity index 100% rename from mist/graphics_island/step_base_s.png rename to mist/graphics_mist/step_base_s.png diff --git a/mist/graphics_island/step_dentist_e.png b/mist/graphics_mist/step_dentist_e.png similarity index 100% rename from mist/graphics_island/step_dentist_e.png rename to mist/graphics_mist/step_dentist_e.png diff --git a/mist/graphics_island/step_dentist_n.png b/mist/graphics_mist/step_dentist_n.png similarity index 100% rename from mist/graphics_island/step_dentist_n.png rename to mist/graphics_mist/step_dentist_n.png diff --git a/mist/graphics_island/step_dentist_w.png b/mist/graphics_mist/step_dentist_w.png similarity index 100% rename from mist/graphics_island/step_dentist_w.png rename to mist/graphics_mist/step_dentist_w.png diff --git a/mist/graphics_island/step_land1_e.png b/mist/graphics_mist/step_land1_e.png similarity index 100% rename from mist/graphics_island/step_land1_e.png rename to mist/graphics_mist/step_land1_e.png diff --git a/mist/graphics_island/step_land1_w.png b/mist/graphics_mist/step_land1_w.png similarity index 100% rename from mist/graphics_island/step_land1_w.png rename to mist/graphics_mist/step_land1_w.png diff --git a/mist/graphics_island/step_land2_e.png b/mist/graphics_mist/step_land2_e.png similarity index 100% rename from mist/graphics_island/step_land2_e.png rename to mist/graphics_mist/step_land2_e.png diff --git a/mist/graphics_island/step_land2_w.png b/mist/graphics_mist/step_land2_w.png similarity index 100% rename from mist/graphics_island/step_land2_w.png rename to mist/graphics_mist/step_land2_w.png diff --git a/mist/graphics_island/step_land3_e.png b/mist/graphics_mist/step_land3_e.png similarity index 100% rename from mist/graphics_island/step_land3_e.png rename to mist/graphics_mist/step_land3_e.png diff --git a/mist/graphics_island/step_land3_w.png b/mist/graphics_mist/step_land3_w.png similarity index 100% rename from mist/graphics_island/step_land3_w.png rename to mist/graphics_mist/step_land3_w.png diff --git a/mist/graphics_island/step_top_e.png b/mist/graphics_mist/step_top_e.png similarity index 100% rename from mist/graphics_island/step_top_e.png rename to mist/graphics_mist/step_top_e.png diff --git a/mist/graphics_island/step_top_n.png b/mist/graphics_mist/step_top_n.png similarity index 100% rename from mist/graphics_island/step_top_n.png rename to mist/graphics_mist/step_top_n.png diff --git a/mist/graphics_island/step_top_s.png b/mist/graphics_mist/step_top_s.png similarity index 100% rename from mist/graphics_island/step_top_s.png rename to mist/graphics_mist/step_top_s.png diff --git a/mist/graphics_island/step_top_w.png b/mist/graphics_mist/step_top_w.png similarity index 100% rename from mist/graphics_island/step_top_w.png rename to mist/graphics_mist/step_top_w.png diff --git a/mist/graphics_island/temple_center_e.png b/mist/graphics_mist/temple_center_e.png similarity index 100% rename from mist/graphics_island/temple_center_e.png rename to mist/graphics_mist/temple_center_e.png diff --git a/mist/graphics_island/temple_center_n.png b/mist/graphics_mist/temple_center_n.png similarity index 100% rename from mist/graphics_island/temple_center_n.png rename to mist/graphics_mist/temple_center_n.png diff --git a/mist/graphics_island/temple_center_s.png b/mist/graphics_mist/temple_center_s.png similarity index 100% rename from mist/graphics_island/temple_center_s.png rename to mist/graphics_mist/temple_center_s.png diff --git a/mist/graphics_island/temple_center_up.png b/mist/graphics_mist/temple_center_up.png similarity index 100% rename from mist/graphics_island/temple_center_up.png rename to mist/graphics_mist/temple_center_up.png diff --git a/mist/graphics_island/temple_center_w.png b/mist/graphics_mist/temple_center_w.png similarity index 100% rename from mist/graphics_island/temple_center_w.png rename to mist/graphics_mist/temple_center_w.png diff --git a/mist/graphics_island/temple_door_n.png b/mist/graphics_mist/temple_door_n.png similarity index 100% rename from mist/graphics_island/temple_door_n.png rename to mist/graphics_mist/temple_door_n.png diff --git a/mist/graphics_island/temple_door_s.png b/mist/graphics_mist/temple_door_s.png similarity index 100% rename from mist/graphics_island/temple_door_s.png rename to mist/graphics_mist/temple_door_s.png diff --git a/mist/graphics_mist/tower2_base_w.png b/mist/graphics_mist/tower2_base_w.png new file mode 100644 index 00000000..f012762e Binary files /dev/null and b/mist/graphics_mist/tower2_base_w.png differ diff --git a/mist/graphics_mist/tower2_path_e.png b/mist/graphics_mist/tower2_path_e.png new file mode 100644 index 00000000..74e0153f Binary files /dev/null and b/mist/graphics_mist/tower2_path_e.png differ diff --git a/mist/graphics_mist/tower2_path_n.png b/mist/graphics_mist/tower2_path_n.png new file mode 100644 index 00000000..332679db Binary files /dev/null and b/mist/graphics_mist/tower2_path_n.png differ diff --git a/mist/graphics_mist/tower2_top_w.png b/mist/graphics_mist/tower2_top_w.png new file mode 100644 index 00000000..5a4699b2 Binary files /dev/null and b/mist/graphics_mist/tower2_top_w.png differ diff --git a/mist/graphics_island/tree2_n.png b/mist/graphics_mist/tree2_n.png similarity index 100% rename from mist/graphics_island/tree2_n.png rename to mist/graphics_mist/tree2_n.png diff --git a/mist/graphics_island/tree4_e.png b/mist/graphics_mist/tree4_e.png similarity index 100% rename from mist/graphics_island/tree4_e.png rename to mist/graphics_mist/tree4_e.png diff --git a/mist/graphics_island/tree4_n.png b/mist/graphics_mist/tree4_n.png similarity index 100% rename from mist/graphics_island/tree4_n.png rename to mist/graphics_mist/tree4_n.png diff --git a/mist/graphics_island/tree4_s.png b/mist/graphics_mist/tree4_s.png similarity index 100% rename from mist/graphics_island/tree4_s.png rename to mist/graphics_mist/tree4_s.png diff --git a/mist/graphics_island/tree4_w.png b/mist/graphics_mist/tree4_w.png similarity index 100% rename from mist/graphics_island/tree4_w.png rename to mist/graphics_mist/tree4_w.png diff --git a/mist/graphics_island/tree5_e.png b/mist/graphics_mist/tree5_e.png similarity index 100% rename from mist/graphics_island/tree5_e.png rename to mist/graphics_mist/tree5_e.png diff --git a/mist/graphics_island/tree5_n.png b/mist/graphics_mist/tree5_n.png similarity index 100% rename from mist/graphics_island/tree5_n.png rename to mist/graphics_mist/tree5_n.png diff --git a/mist/graphics_island/tree_cabin_e.png b/mist/graphics_mist/tree_cabin_e.png similarity index 100% rename from mist/graphics_island/tree_cabin_e.png rename to mist/graphics_mist/tree_cabin_e.png diff --git a/mist/leveldata_mist.inc b/mist/leveldata_mist.inc index 979dc7d7..4761c0dc 100644 --- a/mist/leveldata_mist.inc +++ b/mist/leveldata_mist.inc @@ -43,6 +43,7 @@ locations: .word location28,location29,location30,location31 .word location32,location33,location34,location35 .word location36,location37,location38,location39 + .word location40,location41,location42 ; myst linking book location0: @@ -769,3 +770,58 @@ location39: .byte BG_NORTH .byte $ff +; tower2 path +location40: + .byte 41 ; north exit + .byte $ff ; south exit + .byte 37 ; east exit + .byte $ff ; west exit + .byte DIRECTION_W ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_E ; east exit_dir + .byte $ff ; west exit_dir + .word tower2_path_n_lzsa ; north bg + .word $0000 ; south bg + .word tower2_path_e_lzsa ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_EAST + .byte $ff + +; tower2 base +location41: + .byte $ff ; north exit + .byte $ff ; south exit + .byte $ff ; east exit + .byte 42 ; 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 $0000 ; south bg + .word $0000 ; east bg + .word tower2_base_w_lzsa ; west bg + .byte BG_WEST + .byte $ff + +; tower2 top +location42: + .byte $ff ; north exit + .byte $ff ; south exit + .byte $ff ; east exit + .byte 41 ; 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 $0000 ; south bg + .word $0000 ; east bg + .word tower2_top_w_lzsa ; west bg + .byte BG_WEST + .byte DIRECTION_W ; special exit + .byte 17,22 ; special x + .byte 12,18 ; special y + .word circuit_breaker-1 ; special function + + diff --git a/mist/mist.s b/mist/mist.s index 27852754..7cd78b6e 100644 --- a/mist/mist.s +++ b/mist/mist.s @@ -205,7 +205,7 @@ go_to_meche: .include "audio.s" - .include "graphics_island/mist_graphics.inc" + .include "graphics_mist/mist_graphics.inc" .include "end_level.s"