diff --git a/mist/common_defines.inc b/mist/common_defines.inc index 46c60b2a..2cb075d1 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -468,6 +468,7 @@ NIBEL_RED_TABLE_OPEN = 14 NIBEL_RED_BED = 15 NIBEL_RED_BED_OPEN = 16 NIBEL_HALF_LETTER = 17 +NIBEL_BLUE_PATH_0P5 = 18 DENTIST_OUTSIDE = 0 DENTIST_OUTSIDE_OPEN = 1 diff --git a/mist/default_save.s b/mist/default_save.s index b0135b12..f31b469a 100644 --- a/mist/default_save.s +++ b/mist/default_save.s @@ -2,7 +2,7 @@ .include "common_defines.inc" -.if 1 +.if 0 ; if doing playthrough .include "playthrough_save.inc" .endif @@ -52,15 +52,21 @@ .endif .if 0 -; Sub +; Stoneship .byte LOAD_STONEY ; WHICH_LOAD = $80 .byte DIRECTION_E ; DIRECTION = $81 .byte STONEY_ARRIVAL ; LOCATION = $82 .endif +.if 1 +; NIBEL +.byte LOAD_NIBEL ; WHICH_LOAD = $80 +.byte DIRECTION_E ; DIRECTION = $81 +.byte NIBEL_OUTSIDE_ELEV2_OPEN ; LOCATION = $82 +.endif -.if 0 +.if 1 .byte $00 ; RED_PAGES_TAKEN = $83 .byte $00 ; BLUE_PAGES_TAKEN = $84 .byte $00 ; CLOCK_BRIDGE = $85 diff --git a/mist/graphics_nibel/Makefile b/mist/graphics_nibel/Makefile index 7732294f..070b320e 100644 --- a/mist/graphics_nibel/Makefile +++ b/mist/graphics_nibel/Makefile @@ -11,6 +11,7 @@ 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 \ + 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_path3_n.lzsa blue_path3_s.lzsa \ @@ -27,6 +28,8 @@ 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_path_0p5_n_lzsa: .incbin \"blue_path_0p5_n.lzsa\"" >> nibel_graphics.inc + echo "blue_path_0p5_s_lzsa: .incbin \"blue_path_0p5_s.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 diff --git a/mist/graphics_nibel/blue_path_0p5_n.png b/mist/graphics_nibel/blue_path_0p5_n.png new file mode 100644 index 00000000..594b15ea Binary files /dev/null and b/mist/graphics_nibel/blue_path_0p5_n.png differ diff --git a/mist/graphics_nibel/blue_path_0p5_s.png b/mist/graphics_nibel/blue_path_0p5_s.png new file mode 100644 index 00000000..0f8d2ffa Binary files /dev/null and b/mist/graphics_nibel/blue_path_0p5_s.png differ diff --git a/mist/graphics_nibel/red_room_note_w.png b/mist/graphics_nibel/red_room_note_w.png deleted file mode 100644 index bc72ddb7..00000000 Binary files a/mist/graphics_nibel/red_room_note_w.png and /dev/null differ diff --git a/mist/leveldata_nibel.inc b/mist/leveldata_nibel.inc index b45cedfd..8cb8b550 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 + .word location16,location17,location18 ; NIBEL_IN_ELEV2_TOP_CLOSED -- inside elevator2 at top, door closed location0: @@ -53,7 +53,7 @@ location1: location2: .byte $ff ; north exit .byte $ff ; south exit - .byte NIBEL_BLUE_PATH1 ; east exit + .byte NIBEL_BLUE_PATH_0P5 ; east exit .byte NIBEL_RED_PATH1 ; west exit .byte $ff ; north exit_dir .byte $ff ; south exit_dir @@ -74,7 +74,7 @@ location2: location3: .byte $ff ; north exit .byte $ff ; south exit - .byte NIBEL_BLUE_PATH1 ; east exit + .byte NIBEL_BLUE_PATH_0P5 ; east exit .byte NIBEL_RED_PATH1 ; west exit .byte $ff ; north exit_dir .byte $ff ; south exit_dir @@ -92,11 +92,11 @@ location3: ; NIBEL_BLUE_PATH1 -- path 1 to blue house location4: - .byte NIBEL_OUTSIDE_ELEV2_CLOSED ; north exit + .byte NIBEL_BLUE_PATH_0P5 ; north exit .byte NIBEL_BLUE_PATH2 ; south exit .byte $ff ; east exit .byte $ff ; west exit - .byte DIRECTION_W ; north exit_dir + .byte DIRECTION_N ; north exit_dir .byte DIRECTION_S ; south exit_dir .byte $ff ; east exit_dir .byte $ff ; west exit_dir @@ -344,6 +344,19 @@ location17: .byte BG_WEST .byte $ff ; special exit - - - +; NIBEL_BLUE_PATH_0P5 -- path 0.5 to blue house +location18: + .byte NIBEL_OUTSIDE_ELEV2_CLOSED ; north exit + .byte NIBEL_BLUE_PATH1 ; 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_path_0p5_n_lzsa ; north bg + .word blue_path_0p5_s_lzsa ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_NORTH|BG_SOUTH + .byte $ff