diff --git a/mist/common_defines.inc b/mist/common_defines.inc index 2cb075d1..f276d7dc 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -469,6 +469,7 @@ NIBEL_RED_BED = 15 NIBEL_RED_BED_OPEN = 16 NIBEL_HALF_LETTER = 17 NIBEL_BLUE_PATH_0P5 = 18 +NIBEL_BLUE_PATH_2P25 = 19 DENTIST_OUTSIDE = 0 DENTIST_OUTSIDE_OPEN = 1 diff --git a/mist/graphics_nibel/Makefile b/mist/graphics_nibel/Makefile index 070b320e..32c4851a 100644 --- a/mist/graphics_nibel/Makefile +++ b/mist/graphics_nibel/Makefile @@ -14,6 +14,7 @@ nibel_graphics.inc: \ blue_path_0p5_n.lzsa blue_path_0p5_s.lzsa \ blue_path1_n.lzsa blue_path1_s.lzsa \ blue_path2_n.lzsa blue_path2_s.lzsa \ + blue_path_2p25_n.lzsa blue_path_2p25_s.lzsa blue_path_2p25_e.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 \ @@ -34,6 +35,9 @@ 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_path_2p25_n_lzsa: .incbin \"blue_path_2p25_n.lzsa\"" >> nibel_graphics.inc + echo "blue_path_2p25_s_lzsa: .incbin \"blue_path_2p25_s.lzsa\"" >> nibel_graphics.inc + echo "blue_path_2p25_e_lzsa: .incbin \"blue_path_2p25_e.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 diff --git a/mist/graphics_nibel/blue_path_2p25_e.png b/mist/graphics_nibel/blue_path_2p25_e.png new file mode 100644 index 00000000..b2dc7e07 Binary files /dev/null and b/mist/graphics_nibel/blue_path_2p25_e.png differ diff --git a/mist/graphics_nibel/blue_path_2p25_n.png b/mist/graphics_nibel/blue_path_2p25_n.png new file mode 100644 index 00000000..95fed3f5 Binary files /dev/null and b/mist/graphics_nibel/blue_path_2p25_n.png differ diff --git a/mist/graphics_nibel/blue_path_2p25_s.png b/mist/graphics_nibel/blue_path_2p25_s.png new file mode 100644 index 00000000..fdccdd4a Binary files /dev/null and b/mist/graphics_nibel/blue_path_2p25_s.png differ diff --git a/mist/leveldata_nibel.inc b/mist/leveldata_nibel.inc index 8cb8b550..7ac841ef 100644 --- a/mist/leveldata_nibel.inc +++ b/mist/leveldata_nibel.inc @@ -7,7 +7,7 @@ locations: .word location4, location5, location6, location7 .word location8, location9, location10,location11 .word location12,location13,location14,location15 - .word location16,location17,location18 + .word location16,location17,location18,location19 ; NIBEL_IN_ELEV2_TOP_CLOSED -- inside elevator2 at top, door closed location0: @@ -110,7 +110,7 @@ location4: ; NIBEL_BLUE_PATH2 -- path 2 to blue house location5: .byte NIBEL_BLUE_PATH1 ; north exit - .byte NIBEL_BLUE_PATH3 ; south exit + .byte NIBEL_BLUE_PATH_2P25 ; south exit .byte $ff ; east exit .byte $ff ; west exit .byte DIRECTION_N ; north exit_dir @@ -126,7 +126,7 @@ location5: ; NIBEL_BLUE_PATH3 -- path 3 to blue house location6: - .byte NIBEL_BLUE_PATH2 ; north exit + .byte NIBEL_BLUE_PATH_2P25 ; north exit .byte NIBEL_BLUE_ROOM ; south exit .byte $ff ; east exit .byte $ff ; west exit @@ -360,3 +360,21 @@ location18: .word $0000 ; west bg .byte BG_NORTH|BG_SOUTH .byte $ff + +; NIBEL_BLUE_PATH_2P25 -- path 2.25 with the door to conference room +location19: + .byte NIBEL_BLUE_PATH2 ; north exit + .byte NIBEL_BLUE_PATH3 ; 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_path_2p25_n_lzsa ; north bg + .word blue_path_2p25_s_lzsa ; south bg + .word blue_path_2p25_e_lzsa ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_SOUTH|BG_EAST + .byte $ff +