mist: can sit in fireplace now

This commit is contained in:
Vince Weaver 2020-03-06 15:06:39 -05:00
parent 655802c43f
commit 516b641e42
9 changed files with 51 additions and 4 deletions

View File

Before

Width:  |  Height:  |  Size: 889 B

After

Width:  |  Height:  |  Size: 889 B

View File

Before

Width:  |  Height:  |  Size: 953 B

After

Width:  |  Height:  |  Size: 953 B

View File

Before

Width:  |  Height:  |  Size: 893 B

After

Width:  |  Height:  |  Size: 893 B

View File

@ -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) $< $@

View File

Before

Width:  |  Height:  |  Size: 897 B

After

Width:  |  Height:  |  Size: 897 B

View File

Before

Width:  |  Height:  |  Size: 918 B

After

Width:  |  Height:  |  Size: 918 B

View File

Before

Width:  |  Height:  |  Size: 1000 B

After

Width:  |  Height:  |  Size: 1000 B

View File

@ -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"

View File

@ -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