diff --git a/mist/atrus_book.png b/mist/graphics_dun/atrus_book.png similarity index 100% rename from mist/atrus_book.png rename to mist/graphics_dun/atrus_book.png diff --git a/mist/behind_fireplace.png b/mist/graphics_dun/behind_fireplace.png similarity index 100% rename from mist/behind_fireplace.png rename to mist/graphics_dun/behind_fireplace.png diff --git a/mist/green_book.png b/mist/graphics_dun/green_book.png similarity index 100% rename from mist/green_book.png rename to mist/graphics_dun/green_book.png diff --git a/mist/graphics_island/Makefile b/mist/graphics_island/Makefile index d6afa833..fa4b59c0 100644 --- a/mist/graphics_island/Makefile +++ b/mist/graphics_island/Makefile @@ -39,7 +39,9 @@ mist_graphics.inc: \ tree_cabin_e.lzsa \ clock_island_s.lzsa clock_island_n.lzsa \ clock_puzzle_s.lzsa \ - clock_inside_s.lzsa + clock_inside_s.lzsa \ + fireplace_e.lzsa \ + in_fireplace_w.lzsa in_fireplace_door.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 @@ -99,7 +101,9 @@ mist_graphics.inc: \ echo "clock_island_n_lzsa: .incbin \"clock_island_n.lzsa\"" >> mist_graphics.inc echo "clock_puzzle_s_lzsa: .incbin \"clock_puzzle_s.lzsa\"" >> mist_graphics.inc echo "clock_inside_s_lzsa: .incbin \"clock_inside_s.lzsa\"" >> mist_graphics.inc - + echo "fireplace_e_lzsa: .incbin \"fireplace_e.lzsa\"" >> mist_graphics.inc + echo "in_fireplace_w_lzsa: .incbin \"in_fireplace_w.lzsa\"" >> mist_graphics.inc + echo "in_fireplace_door_lzsa: .incbin \"in_fireplace_door.lzsa\"" >> mist_graphics.inc %.gr: %.png $(PNG2GR) $< $@ diff --git a/mist/fireplace_e.png b/mist/graphics_island/fireplace_e.png similarity index 100% rename from mist/fireplace_e.png rename to mist/graphics_island/fireplace_e.png diff --git a/mist/in_fireplace_door.png b/mist/graphics_island/in_fireplace_door.png similarity index 100% rename from mist/in_fireplace_door.png rename to mist/graphics_island/in_fireplace_door.png diff --git a/mist/in_fireplace_w.png b/mist/graphics_island/in_fireplace_w.png similarity index 100% rename from mist/in_fireplace_w.png rename to mist/graphics_island/in_fireplace_w.png diff --git a/mist/graphics_island/mist_graphics.inc b/mist/graphics_island/mist_graphics.inc index 3e61c910..bb822d06 100644 --- a/mist/graphics_island/mist_graphics.inc +++ b/mist/graphics_island/mist_graphics.inc @@ -57,3 +57,6 @@ clock_island_s_lzsa: .incbin "clock_island_s.lzsa" clock_island_n_lzsa: .incbin "clock_island_n.lzsa" clock_puzzle_s_lzsa: .incbin "clock_puzzle_s.lzsa" clock_inside_s_lzsa: .incbin "clock_inside_s.lzsa" +fireplace_e_lzsa: .incbin "fireplace_e.lzsa" +in_fireplace_w_lzsa: .incbin "in_fireplace_w.lzsa" +in_fireplace_door_lzsa: .incbin "in_fireplace_door.lzsa" diff --git a/mist/mist.s b/mist/mist.s index 44ba13b7..5849fcbd 100644 --- a/mist/mist.s +++ b/mist/mist.s @@ -818,6 +818,7 @@ locations: .word location16,location17,location18,location19 .word location20,location21,location22,location23 .word location24,location25,location26,location27 + .word location28,location29 ; myst linking book location0: @@ -1065,11 +1066,11 @@ location11: location12: .byte $ff ; north exit .byte 11 ; south exit - .byte $ff ; east exit + .byte 28 ; east exit .byte 13 ; west exit .byte $ff ; north exit_dir .byte DIRECTION_S ; south exit_dir - .byte $ff ; east exit_dir + .byte DIRECTION_E ; east exit_dir .byte DIRECTION_W ; west exit_dir .byte $ff ; special exit .word temple_center_n_lzsa ; north bg @@ -1386,6 +1387,45 @@ location27: .word $0000 ; special function .byte BG_SOUTH +; fireplace +location28: + .byte $ff ; north exit + .byte $ff ; south exit + .byte 29 ; east exit + .byte $ff ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_W ; east exit_dir + .byte $ff ; west exit_dir + .byte $ff ; special exit + .word $0000 ; north bg + .word $0000 ; south bg + .word fireplace_e_lzsa ; east bg + .word $0000 ; west bg + .byte $ff,$ff ; special x + .byte $ff,$ff ; special y + .word $0000 ; special function + .byte BG_EAST + +; in fireplace +location29: + .byte $ff ; north exit + .byte $ff ; south exit + .byte $ff ; east exit + .byte 12 ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte $ff ; east exit_dir + .byte DIRECTION_W ; west exit_dir + .byte $00 ; special exit + .word $0000 ; north bg + .word $0000 ; south bg + .word $0000 ; east bg + .word in_fireplace_w_lzsa ; west bg + .byte $ff,$ff ; special x + .byte $ff,$ff ; special y + .word $0000 ; special function + .byte BG_WEST ; west