diff --git a/mist/TODO b/mist/TODO index 9f0cca74..22a22b77 100644 --- a/mist/TODO +++ b/mist/TODO @@ -30,7 +30,7 @@ Marker Switches (8): + * Spaceship + Clock + Cabin -+ Generator ++ * Generator Fireplace: + 8x6 grid @@ -39,7 +39,7 @@ Fireplace: 16 more pictures? + cabin switch -+ generator switch ++ * generator switch + close-in clock + clock with gears up + clock switch diff --git a/mist/graphics_island/Makefile b/mist/graphics_island/Makefile index 82b6f28e..0e98e463 100644 --- a/mist/graphics_island/Makefile +++ b/mist/graphics_island/Makefile @@ -34,7 +34,8 @@ mist_graphics.inc: \ gear_n.lzsa gear_w.lzsa gear_s.lzsa \ gear_base_n.lzsa \ dentist_door_n.lzsa dentist_door_s.lzsa \ - spaceship_switch_n.lzsa + spaceship_switch_n.lzsa \ + tree4_n.lzsa tree4_s.lzsa tree4_w.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 @@ -86,6 +87,9 @@ mist_graphics.inc: \ echo "dentist_door_n_lzsa: .incbin \"dentist_door_n.lzsa\"" >> mist_graphics.inc echo "dentist_door_s_lzsa: .incbin \"dentist_door_s.lzsa\"" >> mist_graphics.inc echo "spaceship_switch_n_lzsa: .incbin \"spaceship_switch_n.lzsa\"" >> mist_graphics.inc + echo "tree4_n_lzsa: .incbin \"tree4_n.lzsa\"" >> mist_graphics.inc + echo "tree4_s_lzsa: .incbin \"tree4_s.lzsa\"" >> mist_graphics.inc + echo "tree4_w_lzsa: .incbin \"tree4_w.lzsa\"" >> mist_graphics.inc %.gr: %.png diff --git a/mist/graphics_island/mist_graphics.inc b/mist/graphics_island/mist_graphics.inc index 868122f1..5577645f 100644 --- a/mist/graphics_island/mist_graphics.inc +++ b/mist/graphics_island/mist_graphics.inc @@ -49,3 +49,6 @@ gear_base_n_lzsa: .incbin "gear_base_n.lzsa" dentist_door_n_lzsa: .incbin "dentist_door_n.lzsa" dentist_door_s_lzsa: .incbin "dentist_door_s.lzsa" spaceship_switch_n_lzsa: .incbin "spaceship_switch_n.lzsa" +tree4_n_lzsa: .incbin "tree4_n.lzsa" +tree4_s_lzsa: .incbin "tree4_s.lzsa" +tree4_w_lzsa: .incbin "tree4_w.lzsa" diff --git a/mist/graphics_island/tree4_n.png b/mist/graphics_island/tree4_n.png new file mode 100644 index 00000000..62841f3e Binary files /dev/null and b/mist/graphics_island/tree4_n.png differ diff --git a/mist/graphics_island/tree4_s.png b/mist/graphics_island/tree4_s.png new file mode 100644 index 00000000..37e41fdb Binary files /dev/null and b/mist/graphics_island/tree4_s.png differ diff --git a/mist/graphics_island/tree4_w.png b/mist/graphics_island/tree4_w.png new file mode 100644 index 00000000..a2206210 Binary files /dev/null and b/mist/graphics_island/tree4_w.png differ diff --git a/mist/mist.s b/mist/mist.s index 94033914..30028649 100644 --- a/mist/mist.s +++ b/mist/mist.s @@ -816,7 +816,7 @@ locations: .word location8, location9, location10,location11 .word location12,location13,location14,location15 .word location16,location17,location18,location19 - .word location20,location21,location22 + .word location20,location21,location22,location23 ; myst linking book location0: @@ -1103,7 +1103,7 @@ location13: ; pool location14: .byte $ff ; north exit - .byte 15 ; south exit + .byte 23 ; south exit .byte $ff ; east exit .byte $ff ; west exit .byte $ff ; north exit_dir @@ -1185,7 +1185,7 @@ location17: ; tree corridor #5 location18: - .byte 17 ; north exit + .byte 23 ; north exit .byte $ff ; south exit .byte $ff ; east exit .byte $ff ; west exit @@ -1284,6 +1284,27 @@ location22: .byte BG_NORTH +; tree corridor4 (with generator switch) +location23: + .byte 17 ; north exit + .byte 15 ; 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 + .byte $ff ; special exit + .word tree4_n_lzsa ; north bg + .word tree4_s_lzsa ; south bg + .word $0000 ; east bg + .word tree4_w_lzsa ; west bg + .byte $ff,$ff ; special x + .byte $ff,$ff ; special y + .word $0000 ; special function + .byte BG_NORTH|BG_SOUTH|BG_WEST + +