diff --git a/mist/common_defines.inc b/mist/common_defines.inc index b224a2eb..1df0ee3c 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -251,6 +251,8 @@ SELENA_ANTENNA_CLOSE = 39 SELENA_BUNKER_OPEN = 40 SELENA_BUNKER_KEYPAD = 41 SELENA_WALKWAY2 = 42 +SELENA_WATER_PATH2 = 43 +SELENA_WATER_PATH3 = 44 ; Submarine on Selena SUB_BUNKER_ENTRY = 0 diff --git a/mist/graphics_selena/Makefile b/mist/graphics_selena/Makefile index e83ae9c8..db2526c4 100644 --- a/mist/graphics_selena/Makefile +++ b/mist/graphics_selena/Makefile @@ -20,6 +20,8 @@ selena_graphics.inc: \ bunker_n.lzsa bunker_s.lzsa bunker_e.lzsa \ water_turn_n.lzsa water_turn_s.lzsa water_turn_w.lzsa \ water_path_e.lzsa water_path_w.lzsa \ + water_path2_e.lzsa water_path2_w.lzsa \ + water_path3_e.lzsa water_path3_w.lzsa \ water_note_n.lzsa water_note_e.lzsa water_note_w.lzsa water_note_s.lzsa \ tower_view_n.lzsa tower_view_s.lzsa tower_view_e.lzsa tower_view_w.lzsa \ chasm_path_e.lzsa chasm_path_w.lzsa \ @@ -67,6 +69,10 @@ selena_graphics.inc: \ echo "water_turn_w_lzsa: .incbin \"water_turn_w.lzsa\"" >> selena_graphics.inc echo "water_path_w_lzsa: .incbin \"water_path_w.lzsa\"" >> selena_graphics.inc echo "water_path_e_lzsa: .incbin \"water_path_e.lzsa\"" >> selena_graphics.inc + echo "water_path2_w_lzsa: .incbin \"water_path2_w.lzsa\"" >> selena_graphics.inc + echo "water_path2_e_lzsa: .incbin \"water_path2_e.lzsa\"" >> selena_graphics.inc + echo "water_path3_w_lzsa: .incbin \"water_path3_w.lzsa\"" >> selena_graphics.inc + echo "water_path3_e_lzsa: .incbin \"water_path3_e.lzsa\"" >> selena_graphics.inc echo "water_note_n_lzsa: .incbin \"water_note_n.lzsa\"" >> selena_graphics.inc echo "water_note_e_lzsa: .incbin \"water_note_e.lzsa\"" >> selena_graphics.inc echo "water_note_w_lzsa: .incbin \"water_note_w.lzsa\"" >> selena_graphics.inc diff --git a/mist/graphics_selena/water_path2_e.png b/mist/graphics_selena/water_path2_e.png new file mode 100644 index 00000000..e1642082 Binary files /dev/null and b/mist/graphics_selena/water_path2_e.png differ diff --git a/mist/graphics_selena/water_path2_w.png b/mist/graphics_selena/water_path2_w.png new file mode 100644 index 00000000..adf4c9bc Binary files /dev/null and b/mist/graphics_selena/water_path2_w.png differ diff --git a/mist/graphics_selena/water_path3_e.png b/mist/graphics_selena/water_path3_e.png new file mode 100644 index 00000000..39859f25 Binary files /dev/null and b/mist/graphics_selena/water_path3_e.png differ diff --git a/mist/graphics_selena/water_path3_w.png b/mist/graphics_selena/water_path3_w.png new file mode 100644 index 00000000..d01ce081 Binary files /dev/null and b/mist/graphics_selena/water_path3_w.png differ diff --git a/mist/leveldata_selena.inc b/mist/leveldata_selena.inc index c9d00126..cd8b35aa 100644 --- a/mist/leveldata_selena.inc +++ b/mist/leveldata_selena.inc @@ -14,7 +14,8 @@ locations: .word location28,location29,location30,location31 .word location32,location33,location34,location35 .word location36,location37,location38,location39 - .word location40,location41,location42 + .word location40,location41,location42,location43 + .word location44 ; SELENA_INSIDE_SHIP -- Inside Ship location0: @@ -151,7 +152,7 @@ location7: .byte SELENA_TOWER_VIEW ; north exit .byte SELENA_BUNKER ; south exit .byte $ff ; east exit - .byte SELENA_WATER_PATH ; west exit + .byte SELENA_WATER_PATH2 ; west exit .byte DIRECTION_N ; north exit_dir .byte DIRECTION_S ; south exit_dir .byte $ff ; east exit_dir @@ -167,11 +168,11 @@ location7: location8: .byte $ff ; north exit .byte $ff ; south exit - .byte SELENA_WATER_TURN ; east exit - .byte SELENA_WATER ; west exit + .byte SELENA_WATER_PATH2 ; east exit + .byte SELENA_WATER_PATH3 ; west exit .byte $ff ; north exit_dir .byte $ff ; south exit_dir - .byte DIRECTION_S ; east exit_dir + .byte DIRECTION_E ; east exit_dir .byte DIRECTION_W ; west exit_dir .word $0000 ; north bg .word $0000 ; south bg @@ -184,7 +185,7 @@ location8: location9: .byte $ff ; north exit .byte $ff ; south exit - .byte SELENA_WATER_PATH ; east exit + .byte SELENA_WATER_PATH3 ; east exit .byte $ff ; west exit .byte $ff ; north exit_dir .byte $ff ; south exit_dir @@ -801,3 +802,38 @@ location42: .word $0000 ; west bg .byte BG_NORTH|BG_SOUTH .byte $ff + +; SELENA_WATER_PATH2 -- more path to water +location43: + .byte $ff ; north exit + .byte $ff ; south exit + .byte SELENA_WATER_TURN ; east exit + .byte SELENA_WATER_PATH ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_S ; east exit_dir + .byte DIRECTION_W ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word water_path2_e_lzsa ; east bg + .word water_path2_w_lzsa ; west bg + .byte BG_EAST|BG_WEST + .byte $ff + +; SELENA_WATER_PATH3 -- more path to water +location44: + .byte $ff ; north exit + .byte $ff ; south exit + .byte SELENA_WATER_PATH ; east exit + .byte SELENA_WATER ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_E ; east exit_dir + .byte DIRECTION_W ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word water_path3_e_lzsa ; east bg + .word water_path3_w_lzsa ; west bg + .byte BG_EAST|BG_WEST + .byte $ff +