diff --git a/mist/common_defines.inc b/mist/common_defines.inc index 323e16b5..35cfdbef 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -254,6 +254,7 @@ SELENA_WALKWAY2 = 42 SELENA_WATER_PATH2 = 43 SELENA_WATER_PATH3 = 44 SELENA_CHASM_PATH2 = 45 +SELENA_CRYSTAL_PATH2 = 46 ; Submarine on Selena SUB_BUNKER_ENTRY = 0 diff --git a/mist/graphics_selena/Makefile b/mist/graphics_selena/Makefile index 7dedaabd..4889acec 100644 --- a/mist/graphics_selena/Makefile +++ b/mist/graphics_selena/Makefile @@ -32,8 +32,9 @@ selena_graphics.inc: \ clock_note_s.lzsa \ clock_before_e.lzsa clock_before_w.lzsa \ crystal_turn_n.lzsa crystal_turn_s.lzsa crystal_turn_e.lzsa crystal_turn_w.lzsa \ - crystal_steps_s.lzsa \ - crystal_path_n.lzsa \ + crystal_steps_n.lzsa crystal_steps_s.lzsa \ + crystal_path_n.lzsa crystal_path_s.lzsa \ + crystal_path2_n.lzsa crystal_path2_s.lzsa \ crystals_s.lzsa crystals_n.lzsa \ crystals_note_e.lzsa \ walkway3_n.lzsa walkway3_s.lzsa \ @@ -47,6 +48,8 @@ selena_graphics.inc: \ antenna_tunnel_w.lzsa antenna_tunnel_e.lzsa \ ladder_top.lzsa ladder_middle.lzsa ladder_bottom.lzsa \ tunnel_e.lzsa tunnel_w.lzsa tunnel_basement.lzsa \ + tunnel_lightson_e.lzsa tunnel_lightson_w.lzsa \ + tunnel_middle_lightson_e.lzsa tunnel_middle_lightson_w.lzsa \ tunnel_note_n.lzsa \ tunnel_main_n.lzsa tunnel_main_s.lzsa \ bunker_keypad_e.lzsa \ @@ -104,7 +107,11 @@ selena_graphics.inc: \ echo "crystal_turn_e_lzsa: .incbin \"crystal_turn_e.lzsa\"" >> selena_graphics.inc echo "crystal_turn_w_lzsa: .incbin \"crystal_turn_w.lzsa\"" >> selena_graphics.inc echo "crystal_steps_s_lzsa: .incbin \"crystal_steps_s.lzsa\"" >> selena_graphics.inc + echo "crystal_steps_n_lzsa: .incbin \"crystal_steps_n.lzsa\"" >> selena_graphics.inc echo "crystal_path_n_lzsa: .incbin \"crystal_path_n.lzsa\"" >> selena_graphics.inc + echo "crystal_path_s_lzsa: .incbin \"crystal_path_s.lzsa\"" >> selena_graphics.inc + echo "crystal_path2_n_lzsa: .incbin \"crystal_path2_n.lzsa\"" >> selena_graphics.inc + echo "crystal_path2_s_lzsa: .incbin \"crystal_path2_s.lzsa\"" >> selena_graphics.inc echo "crystals_s_lzsa: .incbin \"crystals_s.lzsa\"" >> selena_graphics.inc echo "crystals_n_lzsa: .incbin \"crystals_n.lzsa\"" >> selena_graphics.inc echo "crystals_note_e_lzsa: .incbin \"crystals_note_e.lzsa\"" >> selena_graphics.inc @@ -132,6 +139,10 @@ selena_graphics.inc: \ echo "ladder_bottom_lzsa: .incbin \"ladder_bottom.lzsa\"" >> selena_graphics.inc echo "tunnel_e_lzsa: .incbin \"tunnel_e.lzsa\"" >> selena_graphics.inc echo "tunnel_w_lzsa: .incbin \"tunnel_w.lzsa\"" >> selena_graphics.inc + echo "tunnel_lightson_e_lzsa: .incbin \"tunnel_lightson_e.lzsa\"" >> selena_graphics.inc + echo "tunnel_lightson_w_lzsa: .incbin \"tunnel_lightson_w.lzsa\"" >> selena_graphics.inc + echo "tunnel_middle_lightson_e_lzsa: .incbin \"tunnel_middle_lightson_e.lzsa\"" >> selena_graphics.inc + echo "tunnel_middle_lightson_w_lzsa: .incbin \"tunnel_middle_lightson_w.lzsa\"" >> selena_graphics.inc echo "tunnel_basement_lzsa: .incbin \"tunnel_basement.lzsa\"" >> selena_graphics.inc echo "tunnel_note_n_lzsa: .incbin \"tunnel_note_n.lzsa\"" >> selena_graphics.inc echo "tunnel_main_n_lzsa: .incbin \"tunnel_main_n.lzsa\"" >> selena_graphics.inc diff --git a/mist/graphics_selena/crystal_path2_n.png b/mist/graphics_selena/crystal_path2_n.png new file mode 100644 index 00000000..b17ab233 Binary files /dev/null and b/mist/graphics_selena/crystal_path2_n.png differ diff --git a/mist/graphics_selena/crystal_path2_s.png b/mist/graphics_selena/crystal_path2_s.png new file mode 100644 index 00000000..1bf48426 Binary files /dev/null and b/mist/graphics_selena/crystal_path2_s.png differ diff --git a/mist/graphics_selena/crystal_path_s.png b/mist/graphics_selena/crystal_path_s.png new file mode 100644 index 00000000..5fd83e98 Binary files /dev/null and b/mist/graphics_selena/crystal_path_s.png differ diff --git a/mist/graphics_selena/ladder_bottom.png b/mist/graphics_selena/ladder_bottom.png index fdf1c82a..624c1298 100644 Binary files a/mist/graphics_selena/ladder_bottom.png and b/mist/graphics_selena/ladder_bottom.png differ diff --git a/mist/graphics_selena/tunnel_lightson_e.png b/mist/graphics_selena/tunnel_lightson_e.png new file mode 100644 index 00000000..a594fddc Binary files /dev/null and b/mist/graphics_selena/tunnel_lightson_e.png differ diff --git a/mist/graphics_selena/tunnel_lightson_w.png b/mist/graphics_selena/tunnel_lightson_w.png new file mode 100644 index 00000000..18c7401c Binary files /dev/null and b/mist/graphics_selena/tunnel_lightson_w.png differ diff --git a/mist/graphics_selena/tunnel_middle_lightson_e.png b/mist/graphics_selena/tunnel_middle_lightson_e.png new file mode 100644 index 00000000..f6323af9 Binary files /dev/null and b/mist/graphics_selena/tunnel_middle_lightson_e.png differ diff --git a/mist/graphics_selena/tunnel_middle_lightson_w.png b/mist/graphics_selena/tunnel_middle_lightson_w.png new file mode 100644 index 00000000..b093231b Binary files /dev/null and b/mist/graphics_selena/tunnel_middle_lightson_w.png differ diff --git a/mist/leveldata_selena.inc b/mist/leveldata_selena.inc index 3fc276ba..19259401 100644 --- a/mist/leveldata_selena.inc +++ b/mist/leveldata_selena.inc @@ -15,7 +15,7 @@ locations: .word location32,location33,location34,location35 .word location36,location37,location38,location39 .word location40,location41,location42,location43 - .word location44,location45 + .word location44,location45,location46 ; SELENA_INSIDE_SHIP -- Inside Ship location0: @@ -346,41 +346,41 @@ location17: ; SELENA_CRYSTAL_STEPS -- top of steps location18: - .byte $ff ; north exit - .byte SELENA_CRYSTALS ; south exit + .byte SELENA_CRYSTAL_TURN ; north exit + .byte SELENA_CRYSTAL_PATH ; south exit .byte $ff ; east exit .byte $ff ; west exit - .byte $ff ; north exit_dir + .byte DIRECTION_N ; north exit_dir .byte DIRECTION_S ; south exit_dir .byte $ff ; east exit_dir .byte $ff ; west exit_dir - .word $0000 ; north bg + .word crystal_steps_n_lzsa ; north bg .word crystal_steps_s_lzsa ; south bg .word $0000 ; east bg .word $0000 ; west bg - .byte BG_SOUTH + .byte BG_SOUTH|BG_NORTH .byte $ff ; SELENA_CRYSTAL_PATH -- bottom of steps location19: - .byte SELENA_CRYSTAL_TURN ; north exit - .byte $ff ; south exit + .byte SELENA_CRYSTAL_STEPS ; north exit + .byte SELENA_CRYSTAL_PATH2 ; south exit .byte $ff ; east exit - .byte $ff ; west exit + .byte $ff ; west exit .byte DIRECTION_N ; north exit_dir - .byte $ff ; south exit_dir + .byte DIRECTION_S ; south exit_dir .byte $ff ; east exit_dir .byte $ff ; west exit_dir .word crystal_path_n_lzsa ; north bg - .word $0000 ; south bg + .word crystal_path_s_lzsa ; south bg .word $0000 ; east bg .word $0000 ; west bg - .byte BG_NORTH + .byte BG_NORTH|BG_SOUTH .byte $ff ; SELENA_CRYSTALS -- down by the crystals location20: - .byte SELENA_CRYSTAL_PATH ; north exit + .byte SELENA_CRYSTAL_PATH2 ; north exit .byte SELENA_CRYSTAL_CLOSE ; south exit .byte $ff ; east exit .byte $ff ; west exit @@ -853,3 +853,21 @@ location45: .word chasm_path2_w_lzsa ; west bg .byte BG_EAST|BG_WEST .byte $ff + +; SELENA_CRYSTAL_PATH2 -- another path to crystal +location46: + .byte SELENA_CRYSTAL_PATH ; north exit + .byte SELENA_CRYSTALS ; south exit + .byte $ff ; east exit + .byte $ff ; west exit + .byte DIRECTION_N ; north exit_dir + .byte DIRECTION_S ; south exit_dir + .byte $ff ; east exit_dir + .byte $ff ; west exit_dir + .word crystal_path2_n_lzsa ; north bg + .word crystal_path2_s_lzsa ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_SOUTH + .byte $ff + diff --git a/mist/selena_sound_puzzle.s b/mist/selena_sound_puzzle.s index 2fda76aa..cfb9439c 100644 --- a/mist/selena_sound_puzzle.s +++ b/mist/selena_sound_puzzle.s @@ -1295,3 +1295,21 @@ red_button_sprite: .byte 3,2 .byte $19,$11,$19 .byte $91,$11,$91 + + + +;================================ +; tunnel lights +;================================ +; switch up = lights on +; switch down = lights off +; turning one switch also flips other one + + + + + + + + +