diff --git a/mist/graphics_nibel/Makefile b/mist/graphics_nibel/Makefile index 39ea4bb7..2f9cfabe 100644 --- a/mist/graphics_nibel/Makefile +++ b/mist/graphics_nibel/Makefile @@ -12,7 +12,10 @@ nibel_graphics.inc: \ elevator2_open_top.lzsa elevator2_closed_top.lzsa \ outside_elevator2_e.lzsa outside_elevator2_open_w.lzsa outside_elevator2_closed_w.lzsa \ blue_path1_n.lzsa blue_path1_s.lzsa \ - blue_path2_n.lzsa blue_path2_s.lzsa + blue_path2_n.lzsa blue_path2_s.lzsa \ + blue_path3_n.lzsa blue_path3_s.lzsa \ + blue_house_n.lzsa blue_house_s.lzsa blue_house_e.lzsa blue_house_w.lzsa \ + projector_e.lzsa echo "elevator2_open_top_lzsa: .incbin \"elevator2_open_top.lzsa\"" > nibel_graphics.inc echo "elevator2_closed_top_lzsa: .incbin \"elevator2_closed_top.lzsa\"" >> nibel_graphics.inc echo "outside_elevator2_e_lzsa: .incbin \"outside_elevator2_e.lzsa\"" >> nibel_graphics.inc @@ -22,6 +25,17 @@ nibel_graphics.inc: \ echo "blue_path1_s_lzsa: .incbin \"blue_path1_s.lzsa\"" >> nibel_graphics.inc echo "blue_path2_n_lzsa: .incbin \"blue_path2_n.lzsa\"" >> nibel_graphics.inc echo "blue_path2_s_lzsa: .incbin \"blue_path2_s.lzsa\"" >> nibel_graphics.inc + echo "blue_path3_n_lzsa: .incbin \"blue_path3_n.lzsa\"" >> nibel_graphics.inc + echo "blue_path3_s_lzsa: .incbin \"blue_path3_s.lzsa\"" >> nibel_graphics.inc + echo "blue_house_n_lzsa: .incbin \"blue_house_n.lzsa\"" >> nibel_graphics.inc + echo "blue_house_s_lzsa: .incbin \"blue_house_s.lzsa\"" >> nibel_graphics.inc + echo "blue_house_e_lzsa: .incbin \"blue_house_e.lzsa\"" >> nibel_graphics.inc + echo "blue_house_w_lzsa: .incbin \"blue_house_w.lzsa\"" >> nibel_graphics.inc + echo "projector_e_lzsa: .incbin \"projector_e.lzsa\"" >> nibel_graphics.inc + + + + %.gr: %.png $(PNG2GR) $< $@ diff --git a/mist/graphics_nibel/blue_house_e.png b/mist/graphics_nibel/blue_house_e.png new file mode 100644 index 00000000..198e1df0 Binary files /dev/null and b/mist/graphics_nibel/blue_house_e.png differ diff --git a/mist/graphics_nibel/blue_house_n.png b/mist/graphics_nibel/blue_house_n.png new file mode 100644 index 00000000..20598d1f Binary files /dev/null and b/mist/graphics_nibel/blue_house_n.png differ diff --git a/mist/graphics_nibel/blue_house_s.png b/mist/graphics_nibel/blue_house_s.png new file mode 100644 index 00000000..28356071 Binary files /dev/null and b/mist/graphics_nibel/blue_house_s.png differ diff --git a/mist/graphics_nibel/blue_house_w.png b/mist/graphics_nibel/blue_house_w.png new file mode 100644 index 00000000..4f075ffa Binary files /dev/null and b/mist/graphics_nibel/blue_house_w.png differ diff --git a/mist/graphics_nibel/blue_path3_n.png b/mist/graphics_nibel/blue_path3_n.png new file mode 100644 index 00000000..c9559b08 Binary files /dev/null and b/mist/graphics_nibel/blue_path3_n.png differ diff --git a/mist/graphics_nibel/blue_path3_s.png b/mist/graphics_nibel/blue_path3_s.png new file mode 100644 index 00000000..79107149 Binary files /dev/null and b/mist/graphics_nibel/blue_path3_s.png differ diff --git a/mist/graphics_nibel/projector_e.png b/mist/graphics_nibel/projector_e.png new file mode 100644 index 00000000..51106525 Binary files /dev/null and b/mist/graphics_nibel/projector_e.png differ diff --git a/mist/leveldata_nibel.inc b/mist/leveldata_nibel.inc index ef97d471..5662428e 100644 --- a/mist/leveldata_nibel.inc +++ b/mist/leveldata_nibel.inc @@ -4,7 +4,8 @@ locations: .word location0, location1, location2, location3 - .word location4, location5 + .word location4, location5, location6, location7 + .word location8 ; NIBEL_IN_ELEV2_TOP_CLOSED -- inside elevator2 at top, door closed location0: @@ -100,7 +101,7 @@ location4: ; NIBEL_BLUE_PATH2 -- path 2 to blue house location5: .byte NIBEL_BLUE_PATH1 ; north exit - .byte $ff ; south exit + .byte NIBEL_BLUE_PATH3 ; south exit .byte $ff ; east exit .byte $ff ; west exit .byte DIRECTION_N ; north exit_dir @@ -114,5 +115,54 @@ location5: .byte BG_NORTH|BG_SOUTH .byte $ff +; NIBEL_BLUE_PATH3 -- path 3 to blue house +location6: + .byte NIBEL_BLUE_PATH2 ; north exit + .byte NIBEL_BLUE_ROOM ; 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 blue_path3_n_lzsa ; north bg + .word blue_path3_s_lzsa ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_SOUTH + .byte $ff +; NIBEL_BLUE_ROOM -- blue house +location7: + .byte NIBEL_BLUE_PATH3 ; north exit + .byte $ff ; south exit + .byte NIBEL_BLUE_HOUSE_VIEWER ; east exit + .byte $ff ; west exit + .byte DIRECTION_N ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_E ; east exit_dir + .byte $ff ; west exit_dir + .word blue_house_n_lzsa ; north bg + .word blue_house_s_lzsa ; south bg + .word blue_house_e_lzsa ; east bg + .word blue_house_w_lzsa ; west bg + .byte BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST + .byte $ff + +; NIBEL_BLUE_HOUSE_VIEWER -- blue house viewer machine +location8: + .byte $ff ; north exit + .byte $ff ; south exit + .byte NIBEL_BLUE_ROOM ; east exit + .byte $ff ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_E ; east exit_dir + .byte $ff ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word projector_e_lzsa ; east bg + .word $0000 ; west bg + .byte BG_EAST + .byte $ff