diff --git a/mist/common_defines.inc b/mist/common_defines.inc index abc8c3b8..18ba8760 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -323,3 +323,6 @@ CHANNEL_TREE_BOOK = 10 CHANNEL_TREE_BOOK_CLOSED= 11 CHANNEL_TREE_BOOK_OPEN = 12 CHANNEL_ARRIVAL = 13 +CHANNEL_PATH2 = 14 +CHANNEL_PATH3 = 15 +CHANNEL_BRIDGE = 16 diff --git a/mist/graphics_channel/Makefile b/mist/graphics_channel/Makefile index 9c91f70c..a1497642 100644 --- a/mist/graphics_channel/Makefile +++ b/mist/graphics_channel/Makefile @@ -22,7 +22,10 @@ channel_graphics.inc: \ tree_basement_book_s.lzsa \ tree_basement_book_open_s.lzsa \ tree_basement_book_closed_s.lzsa \ - tree_elevator_basement_s.lzsa + tree_elevator_basement_s.lzsa \ + bridge_w.lzsa bridge_down_e.lzsa \ + path2_e.lzsa path2_s.lzsa path2_n.lzsa \ + path3_w.lzsa path3_e.lzsa path3_n.lzsa echo "arrival_n_lzsa: .incbin \"arrival_n.lzsa\"" > channel_graphics.inc echo "arrival_s_lzsa: .incbin \"arrival_s.lzsa\"" >> channel_graphics.inc echo "clearing_e_lzsa: .incbin \"clearing_e.lzsa\"" >> channel_graphics.inc @@ -46,6 +49,15 @@ channel_graphics.inc: \ echo "tree_basement_book_open_s_lzsa: .incbin \"tree_basement_book_open_s.lzsa\"" >> channel_graphics.inc echo "tree_basement_book_closed_s_lzsa: .incbin \"tree_basement_book_closed_s.lzsa\"" >> channel_graphics.inc echo "tree_elevator_basement_s_lzsa: .incbin \"tree_elevator_basement_s.lzsa\"" >> channel_graphics.inc + echo "bridge_w_lzsa: .incbin \"bridge_w.lzsa\"" >> channel_graphics.inc + echo "bridge_down_e_lzsa: .incbin \"bridge_down_e.lzsa\"" >> channel_graphics.inc + echo "path2_n_lzsa: .incbin \"path2_n.lzsa\"" >> channel_graphics.inc + echo "path2_s_lzsa: .incbin \"path2_s.lzsa\"" >> channel_graphics.inc + echo "path2_e_lzsa: .incbin \"path2_e.lzsa\"" >> channel_graphics.inc + echo "path3_w_lzsa: .incbin \"path3_w.lzsa\"" >> channel_graphics.inc + echo "path3_e_lzsa: .incbin \"path3_e.lzsa\"" >> channel_graphics.inc + echo "path3_n_lzsa: .incbin \"path3_n.lzsa\"" >> channel_graphics.inc + %.gr: %.png $(PNG2GR) $< $@ diff --git a/mist/graphics_channel/arrival_n.png b/mist/graphics_channel/arrival_n.png index 5aabcd75..e8bcd53f 100644 Binary files a/mist/graphics_channel/arrival_n.png and b/mist/graphics_channel/arrival_n.png differ diff --git a/mist/graphics_channel/arrival_s.png b/mist/graphics_channel/arrival_s.png index e8bcd53f..5aabcd75 100644 Binary files a/mist/graphics_channel/arrival_s.png and b/mist/graphics_channel/arrival_s.png differ diff --git a/mist/graphics_channel/boiler_e.png b/mist/graphics_channel/boiler_e.png index 14d00395..812032e7 100644 Binary files a/mist/graphics_channel/boiler_e.png and b/mist/graphics_channel/boiler_e.png differ diff --git a/mist/graphics_channel/boiler_room_e.png b/mist/graphics_channel/boiler_room_e.png index e1cae1a5..a3d7dd2b 100644 Binary files a/mist/graphics_channel/boiler_room_e.png and b/mist/graphics_channel/boiler_room_e.png differ diff --git a/mist/graphics_channel/bridge_down_e.png b/mist/graphics_channel/bridge_down_e.png new file mode 100644 index 00000000..85139a76 Binary files /dev/null and b/mist/graphics_channel/bridge_down_e.png differ diff --git a/mist/graphics_channel/bridge_w.png b/mist/graphics_channel/bridge_w.png new file mode 100644 index 00000000..15c34b7b Binary files /dev/null and b/mist/graphics_channel/bridge_w.png differ diff --git a/mist/graphics_channel/path2_e.png b/mist/graphics_channel/path2_e.png new file mode 100644 index 00000000..21a8774f Binary files /dev/null and b/mist/graphics_channel/path2_e.png differ diff --git a/mist/graphics_channel/path2_n.png b/mist/graphics_channel/path2_n.png new file mode 100644 index 00000000..85998751 Binary files /dev/null and b/mist/graphics_channel/path2_n.png differ diff --git a/mist/graphics_channel/path2_s.png b/mist/graphics_channel/path2_s.png new file mode 100644 index 00000000..6b7649eb Binary files /dev/null and b/mist/graphics_channel/path2_s.png differ diff --git a/mist/graphics_channel/path3_e.png b/mist/graphics_channel/path3_e.png new file mode 100644 index 00000000..765dd831 Binary files /dev/null and b/mist/graphics_channel/path3_e.png differ diff --git a/mist/graphics_channel/path3_n.png b/mist/graphics_channel/path3_n.png new file mode 100644 index 00000000..c5265504 Binary files /dev/null and b/mist/graphics_channel/path3_n.png differ diff --git a/mist/graphics_channel/path3_w.png b/mist/graphics_channel/path3_w.png new file mode 100644 index 00000000..169b113f Binary files /dev/null and b/mist/graphics_channel/path3_w.png differ diff --git a/mist/leveldata_channel.inc b/mist/leveldata_channel.inc index 4bcbacb8..9cd004a1 100644 --- a/mist/leveldata_channel.inc +++ b/mist/leveldata_channel.inc @@ -3,11 +3,11 @@ ;=============================================== locations: - .word location0,location1,location2,location3 - .word location4,location5,location6,location7 - .word location8,location9,location10,location11 - .word location12,location13 - + .word location0, location1, location2, location3 + .word location4, location5, location6, location7 + .word location8, location9, location10,location11 + .word location12,location13,location14,location15 + .word location16 ; CHANNEL_OUTSIDE_CABIN -- outside in clearing @@ -248,11 +248,11 @@ location12: ; CHANNEL_ARRIVAL -- arrival in channelwood location13: - .byte $ff ; north exit + .byte CHANNEL_PATH2 ; north exit .byte $ff ; south exit .byte $ff ; east exit .byte $ff ; west exit - .byte $ff ; north exit_dir + .byte DIRECTION_N ; north exit_dir .byte $ff ; south exit_dir .byte $ff ; east exit_dir .byte $ff ; west exit_dir @@ -262,3 +262,57 @@ location13: .word $0000 ; west bg .byte BG_SOUTH|BG_NORTH .byte $ff + +; CHANNEL_PATH2 -- twisty maze of passages all alike +location14: + .byte $ff ; north exit + .byte CHANNEL_ARRIVAL ; south exit + .byte CHANNEL_PATH3 ; east exit + .byte $ff ; west exit + .byte $ff ; north exit_dir + .byte DIRECTION_S ; south exit_dir + .byte DIRECTION_E ; east exit_dir + .byte $ff ; west exit_dir + .word path2_n_lzsa ; north bg + .word path2_s_lzsa ; south bg + .word path2_e_lzsa ; east bg + .word $0000 ; west bg + .byte BG_SOUTH|BG_NORTH|BG_EAST + .byte $ff + +; CHANNEL_PATH3 -- twisty maze of passages all alike +location15: + .byte $ff ; north exit + .byte $ff ; south exit + .byte CHANNEL_BRIDGE ; east exit + .byte CHANNEL_PATH2 ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_E ; east exit_dir + .byte DIRECTION_S ; west exit_dir + .word path3_n_lzsa ; north bg + .word $0000 ; south bg + .word path3_e_lzsa ; east bg + .word path3_w_lzsa ; west bg + .byte BG_NORTH|BG_WEST|BG_EAST + .byte $ff + +; CHANNEL_BRIDGE -- raisable bridge +location16: + .byte $ff ; north exit + .byte $ff ; south exit + .byte $ff ; east exit + .byte CHANNEL_PATH3 ; 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 bridge_down_e_lzsa ; east bg + .word bridge_w_lzsa ; west bg + .byte BG_WEST|BG_EAST + .byte $ff + + + diff --git a/mist/link_book_channel.s b/mist/link_book_channel.s index 0e65f748..b9f814bb 100644 --- a/mist/link_book_channel.s +++ b/mist/link_book_channel.s @@ -35,7 +35,7 @@ channel_link_book: lda #CHANNEL_ARRIVAL sta LOCATION - lda #DIRECTION_N + lda #DIRECTION_S sta DIRECTION jsr change_location