diff --git a/mist/common_defines.inc b/mist/common_defines.inc index f276d7dc..65645f7e 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -470,6 +470,7 @@ NIBEL_RED_BED_OPEN = 16 NIBEL_HALF_LETTER = 17 NIBEL_BLUE_PATH_0P5 = 18 NIBEL_BLUE_PATH_2P25 = 19 +NIBEL_BLUE_PATH_2P5 = 20 DENTIST_OUTSIDE = 0 DENTIST_OUTSIDE_OPEN = 1 diff --git a/mist/graphics_nibel/Makefile b/mist/graphics_nibel/Makefile index 32c4851a..344dc0d9 100644 --- a/mist/graphics_nibel/Makefile +++ b/mist/graphics_nibel/Makefile @@ -15,6 +15,7 @@ nibel_graphics.inc: \ 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_path_2p5_n.lzsa blue_path_2p5_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 \ @@ -38,6 +39,8 @@ 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_path_2p5_n_lzsa: .incbin \"blue_path_2p5_n.lzsa\"" >> nibel_graphics.inc + echo "blue_path_2p5_s_lzsa: .incbin \"blue_path_2p5_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 diff --git a/mist/graphics_nibel/blue_path_2p5_n.png b/mist/graphics_nibel/blue_path_2p5_n.png new file mode 100644 index 00000000..0b390694 Binary files /dev/null and b/mist/graphics_nibel/blue_path_2p5_n.png differ diff --git a/mist/graphics_nibel/blue_path_2p5_s.png b/mist/graphics_nibel/blue_path_2p5_s.png new file mode 100644 index 00000000..e65ada05 Binary files /dev/null and b/mist/graphics_nibel/blue_path_2p5_s.png differ diff --git a/mist/leveldata_nibel.inc b/mist/leveldata_nibel.inc index 7ac841ef..dc41b0b2 100644 --- a/mist/leveldata_nibel.inc +++ b/mist/leveldata_nibel.inc @@ -8,6 +8,7 @@ locations: .word location8, location9, location10,location11 .word location12,location13,location14,location15 .word location16,location17,location18,location19 + .word location20 ; NIBEL_IN_ELEV2_TOP_CLOSED -- inside elevator2 at top, door closed location0: @@ -126,7 +127,7 @@ location5: ; NIBEL_BLUE_PATH3 -- path 3 to blue house location6: - .byte NIBEL_BLUE_PATH_2P25 ; north exit + .byte NIBEL_BLUE_PATH_2P5 ; north exit .byte NIBEL_BLUE_ROOM ; south exit .byte $ff ; east exit .byte $ff ; west exit @@ -364,7 +365,7 @@ location18: ; 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 NIBEL_BLUE_PATH_2P5 ; south exit .byte $ff ; east exit .byte $ff ; west exit .byte DIRECTION_N ; north exit_dir @@ -378,3 +379,21 @@ location19: .byte BG_NORTH|BG_SOUTH|BG_EAST .byte $ff +; NIBEL_BLUE_PATH_2P5 -- path 2.5 along the wall +location20: + .byte NIBEL_BLUE_PATH_2P25 ; 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_2p5_n_lzsa ; north bg + .word blue_path_2p5_s_lzsa ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_SOUTH + .byte $ff + +