diff --git a/mist/TODO b/mist/TODO index 17f22773..9f9823f1 100644 --- a/mist/TODO +++ b/mist/TODO @@ -1,3 +1,14 @@ +Selena: ++ turn around? ++ re-try scenery ++ whole way to tower thing + +main: ++ leave at angle ++ re-set levers ++ close door on ss + + Images left: + tree4_e + ladder1_path_n diff --git a/mist/graphics_selena/Makefile b/mist/graphics_selena/Makefile index df8ba130..a82091d6 100644 --- a/mist/graphics_selena/Makefile +++ b/mist/graphics_selena/Makefile @@ -14,7 +14,10 @@ selena_graphics.inc: \ organ_w.lzsa \ spaceship_inside_w.lzsa spaceship_inside_e.lzsa \ spaceship_inside_selena_n.lzsa spaceship_inside_mist_n.lzsa \ - walkway1_n.lzsa + walkway1_n.lzsa walkway1_s.lzsa \ + spaceship_door_s.lzsa \ + walkway4_n.lzsa walkway4_s.lzsa \ + bunker_n.lzsa bunker_s.lzsa bunker_e.lzsa echo "controls_e_lzsa: .incbin \"controls_e.lzsa\"" > selena_graphics.inc echo "organ_w_lzsa: .incbin \"organ_w.lzsa\"" >> selena_graphics.inc echo "spaceship_inside_w_lzsa: .incbin \"spaceship_inside_w.lzsa\"" >> selena_graphics.inc @@ -22,6 +25,13 @@ selena_graphics.inc: \ echo "spaceship_inside_selena_n_lzsa: .incbin \"spaceship_inside_selena_n.lzsa\"" >> selena_graphics.inc echo "spaceship_inside_mist_n_lzsa: .incbin \"spaceship_inside_mist_n.lzsa\"" >> selena_graphics.inc echo "walkway1_n_lzsa: .incbin \"walkway1_n.lzsa\"" >> selena_graphics.inc + echo "walkway1_s_lzsa: .incbin \"walkway1_s.lzsa\"" >> selena_graphics.inc + echo "spaceship_door_s_lzsa: .incbin \"spaceship_door_s.lzsa\"" >> selena_graphics.inc + echo "walkway4_n_lzsa: .incbin \"walkway4_n.lzsa\"" >> selena_graphics.inc + echo "walkway4_s_lzsa: .incbin \"walkway4_s.lzsa\"" >> selena_graphics.inc + echo "bunker_n_lzsa: .incbin \"bunker_n.lzsa\"" >> selena_graphics.inc + echo "bunker_s_lzsa: .incbin \"bunker_s.lzsa\"" >> selena_graphics.inc + echo "bunker_e_lzsa: .incbin \"bunker_e.lzsa\"" >> selena_graphics.inc %.gr: %.png diff --git a/mist/graphics_selena/bunker_e.png b/mist/graphics_selena/bunker_e.png new file mode 100644 index 00000000..c5ba8636 Binary files /dev/null and b/mist/graphics_selena/bunker_e.png differ diff --git a/mist/graphics_selena/bunker_n.png b/mist/graphics_selena/bunker_n.png new file mode 100644 index 00000000..1ae880a4 Binary files /dev/null and b/mist/graphics_selena/bunker_n.png differ diff --git a/mist/graphics_selena/bunker_s.png b/mist/graphics_selena/bunker_s.png new file mode 100644 index 00000000..5de15b78 Binary files /dev/null and b/mist/graphics_selena/bunker_s.png differ diff --git a/mist/graphics_selena/walkway1_s.png b/mist/graphics_selena/walkway1_s.png new file mode 100644 index 00000000..0e2b7159 Binary files /dev/null and b/mist/graphics_selena/walkway1_s.png differ diff --git a/mist/graphics_selena/walkway4_n.png b/mist/graphics_selena/walkway4_n.png new file mode 100644 index 00000000..9af2b2ad Binary files /dev/null and b/mist/graphics_selena/walkway4_n.png differ diff --git a/mist/graphics_selena/walkway4_s.png b/mist/graphics_selena/walkway4_s.png new file mode 100644 index 00000000..317a9956 Binary files /dev/null and b/mist/graphics_selena/walkway4_s.png differ diff --git a/mist/leveldata_selena.inc b/mist/leveldata_selena.inc index 323e60e4..be245cd4 100644 --- a/mist/leveldata_selena.inc +++ b/mist/leveldata_selena.inc @@ -34,7 +34,7 @@ LOCATION_SPECIAL_FUNC=22 ; pointer-1 of function to call on click locations: .word location0, location1, location2, location3 - + .word location4, location5, location6 ; Inside Ship location0: @@ -98,19 +98,70 @@ location2: ; walkway1 location3: - .byte $ff ; north exit - .byte $ff ; south exit + .byte 5 ; north exit + .byte 4 ; south exit .byte $ff ; east exit .byte $ff ; west exit - .byte $ff ; north exit_dir - .byte $ff ; south 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 walkway1_n_lzsa ; north bg - .word $0000 ; south bg + .word walkway1_s_lzsa ; south bg .word $0000 ; east bg .word $0000 ; west bg .byte BG_NORTH .byte $ff +; spaceship door +location4: + .byte $ff ; north exit + .byte 3 ; south exit + .byte $ff ; east exit + .byte $ff ; west exit + .byte $ff ; north exit_dir + .byte DIRECTION_N ; south exit_dir + .byte $ff ; east exit_dir + .byte $ff ; west exit_dir + .word $0000 ; north bg + .word spaceship_door_s_lzsa ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_SOUTH + .byte $ff + +; walkway4 +location5: + .byte 6 ; north exit + .byte 3 ; 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 walkway4_n_lzsa ; north bg + .word walkway4_s_lzsa ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_SOUTH + .byte $ff + +; bunker +location6: + .byte $ff ; north exit + .byte 5 ; south exit + .byte $ff ; east exit + .byte $ff ; west exit + .byte $ff ; north exit_dir + .byte DIRECTION_S ; south exit_dir + .byte $ff ; east exit_dir + .byte $ff ; west exit_dir + .word bunker_n_lzsa ; north bg + .word bunker_s_lzsa ; south bg + .word bunker_e_lzsa ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_SOUTH|BG_EAST + .byte $ff +