diff --git a/mist/common_defines.inc b/mist/common_defines.inc index 6d4cdd0c..9cdecde3 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -397,4 +397,17 @@ NIBEL_IN_ELEV2_TOP_CLOSED= 0 NIBEL_IN_ELEV2_TOP_OPEN= 1 NIBEL_OUTSIDE_ELEV2_OPEN= 2 NIBEL_OUTSIDE_ELEV2_CLOSED= 3 +NIBEL_BLUE_PATH1 = 4 +NIBEL_BLUE_PATH2 = 5 +NIBEL_BLUE_PATH3 = 6 +NIBEL_BLUE_ROOM = 7 +NIBEL_BLUE_HOUSE_VIEWER = 8 +NIBEL_RED_PATH1 = 9 +NIBEL_RED_DOOR_CLOSED = 10 +NIBEL_RED_DOOR_OPEN = 11 +NIBEL_RED_ROOM = 12 +NIBEL_RED_BED = 13 +NIBEL_RED_BED_OPEN = 14 +NIBEL_RED_TABLE = 15 +NIBEL_RED_TABLE_OPEN = 16 diff --git a/mist/graphics_nibel/Makefile b/mist/graphics_nibel/Makefile index e4d924d0..39ea4bb7 100644 --- a/mist/graphics_nibel/Makefile +++ b/mist/graphics_nibel/Makefile @@ -10,12 +10,18 @@ all: nibel_graphics.inc 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 + 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 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 echo "outside_elevator2_open_w_lzsa: .incbin \"outside_elevator2_open_w.lzsa\"" >> nibel_graphics.inc echo "outside_elevator2_closed_w_lzsa: .incbin \"outside_elevator2_closed_w.lzsa\"" >> nibel_graphics.inc + echo "blue_path1_n_lzsa: .incbin \"blue_path1_n.lzsa\"" >> 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 %.gr: %.png $(PNG2GR) $< $@ diff --git a/mist/graphics_nibel/blue_path1_n.png b/mist/graphics_nibel/blue_path1_n.png new file mode 100644 index 00000000..bd7eb2d9 Binary files /dev/null and b/mist/graphics_nibel/blue_path1_n.png differ diff --git a/mist/graphics_nibel/blue_path1_s.png b/mist/graphics_nibel/blue_path1_s.png new file mode 100644 index 00000000..2f269a14 Binary files /dev/null and b/mist/graphics_nibel/blue_path1_s.png differ diff --git a/mist/graphics_nibel/blue_path2_n.png b/mist/graphics_nibel/blue_path2_n.png new file mode 100644 index 00000000..006c3467 Binary files /dev/null and b/mist/graphics_nibel/blue_path2_n.png differ diff --git a/mist/graphics_nibel/blue_path2_s.png b/mist/graphics_nibel/blue_path2_s.png new file mode 100644 index 00000000..d203ac0c Binary files /dev/null and b/mist/graphics_nibel/blue_path2_s.png differ diff --git a/mist/leveldata_nibel.inc b/mist/leveldata_nibel.inc index 33c88a3d..ef97d471 100644 --- a/mist/leveldata_nibel.inc +++ b/mist/leveldata_nibel.inc @@ -4,6 +4,7 @@ locations: .word location0, location1, location2, location3 + .word location4, location5 ; NIBEL_IN_ELEV2_TOP_CLOSED -- inside elevator2 at top, door closed location0: @@ -49,11 +50,11 @@ location1: location2: .byte $ff ; north exit .byte $ff ; south exit - .byte $ff ; east exit + .byte NIBEL_BLUE_PATH1 ; east exit .byte NIBEL_IN_ELEV2_TOP_OPEN ; west exit .byte $ff ; north exit_dir .byte $ff ; south exit_dir - .byte DIRECTION_E ; east exit_dir + .byte DIRECTION_S ; east exit_dir .byte DIRECTION_E ; west exit_dir .word $0000 ; north bg .word $0000 ; south bg @@ -66,11 +67,11 @@ location2: location3: .byte $ff ; north exit .byte $ff ; south exit - .byte $ff ; east exit + .byte NIBEL_BLUE_PATH1 ; east exit .byte NIBEL_OUTSIDE_ELEV2_OPEN ; west exit .byte $ff ; north exit_dir .byte $ff ; south exit_dir - .byte DIRECTION_E ; east exit_dir + .byte DIRECTION_S ; east exit_dir .byte DIRECTION_W ; west exit_dir .word $0000 ; north bg .word $0000 ; south bg @@ -79,3 +80,39 @@ location3: .byte BG_EAST|BG_WEST .byte $ff +; NIBEL_BLUE_PATH1 -- path 1 to blue house +location4: + .byte NIBEL_OUTSIDE_ELEV2_CLOSED ; north exit + .byte NIBEL_BLUE_PATH2 ; south exit + .byte $ff ; east exit + .byte $ff ; west exit + .byte DIRECTION_W ; north exit_dir + .byte DIRECTION_S ; south exit_dir + .byte $ff ; east exit_dir + .byte $ff ; west exit_dir + .word blue_path1_n_lzsa ; north bg + .word blue_path1_s_lzsa ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_SOUTH + .byte $ff + +; NIBEL_BLUE_PATH2 -- path 2 to blue house +location5: + .byte NIBEL_BLUE_PATH1 ; north exit + .byte $ff ; 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_path2_n_lzsa ; north bg + .word blue_path2_s_lzsa ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_SOUTH + .byte $ff + + +