diff --git a/mist/common_defines.inc b/mist/common_defines.inc index ddc4fc45..5731d224 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -205,7 +205,7 @@ MECHE_RED_SECRET_DOOR = 40 MECHE_RED_SECRET_ROOM = 41 MECHE_TOP_FLOOR_UP = 42 MECHE_ACHENAR_LETTER = 43 - +MECHE_EAST_PATH = 44 diff --git a/mist/default_save.s b/mist/default_save.s index 1285c76a..516d0ec7 100644 --- a/mist/default_save.s +++ b/mist/default_save.s @@ -23,6 +23,14 @@ .byte MECHE_ARRIVAL ; LOCATION = $82 .endif +.if 1 +; MECHE +.byte LOAD_MECHE ; WHICH_LOAD = $80 +.byte DIRECTION_E ; DIRECTION = $81 +.byte MECHE_EAST_PLATFORM ; LOCATION = $82 +.endif + + .if 0 ; CHANNEL .byte LOAD_CHANNEL ; WHICH_LOAD = $80 @@ -58,7 +66,7 @@ .byte STONEY_ARRIVAL ; LOCATION = $82 .endif -.if 1 +.if 0 ; NIBEL .byte LOAD_NIBEL ; WHICH_LOAD = $80 .byte DIRECTION_E ; DIRECTION = $81 diff --git a/mist/graphics_meche/Makefile b/mist/graphics_meche/Makefile index a8fd6ed7..ec7586f6 100644 --- a/mist/graphics_meche/Makefile +++ b/mist/graphics_meche/Makefile @@ -46,7 +46,7 @@ meche_graphics.inc: \ top_floor_up_w.lzsa \ top_floor_ye_w.lzsa top_floor_ne_w.lzsa \ rotate_controls_e.lzsa \ - eastturn_e.lzsa eastturn_w.lzsa \ + eastturn_e.lzsa eastturn_w.lzsa eastturn_n.lzsa eastturn_s.lzsa \ east_arch_w.lzsa east_arch_s.lzsa \ east_hint_e.lzsa \ east_top_e.lzsa east_top_w.lzsa \ @@ -60,7 +60,8 @@ meche_graphics.inc: \ blue_secret_room_jolt_n.lzsa \ red_secret_door_s.lzsa \ red_secret_room_n.lzsa red_secret_room_s.lzsa red_secret_room_e.lzsa red_secret_room_w.lzsa \ - achenar_letter.lzsa + achenar_letter.lzsa \ + east_path_e.lzsa east_path_w.lzsa echo "departure_e_lzsa: .incbin \"departure_e.lzsa\"" > meche_graphics.inc echo "arrival_w_lzsa: .incbin \"arrival_w.lzsa\"" >> meche_graphics.inc echo "entrance_e_lzsa: .incbin \"entrance_e.lzsa\"" >> meche_graphics.inc @@ -136,6 +137,8 @@ meche_graphics.inc: \ echo "rotate_controls_e_lzsa: .incbin \"rotate_controls_e.lzsa\"" >> meche_graphics.inc echo "eastturn_e_lzsa: .incbin \"eastturn_e.lzsa\"" >> meche_graphics.inc echo "eastturn_w_lzsa: .incbin \"eastturn_w.lzsa\"" >> meche_graphics.inc + echo "eastturn_n_lzsa: .incbin \"eastturn_n.lzsa\"" >> meche_graphics.inc + echo "eastturn_s_lzsa: .incbin \"eastturn_s.lzsa\"" >> meche_graphics.inc echo "east_arch_w_lzsa: .incbin \"east_arch_w.lzsa\"" >> meche_graphics.inc echo "east_arch_s_lzsa: .incbin \"east_arch_s.lzsa\"" >> meche_graphics.inc echo "east_hint_e_lzsa: .incbin \"east_hint_e.lzsa\"" >> meche_graphics.inc @@ -162,7 +165,8 @@ meche_graphics.inc: \ echo "red_secret_room_e_lzsa: .incbin \"red_secret_room_e.lzsa\"" >> meche_graphics.inc echo "red_secret_room_w_lzsa: .incbin \"red_secret_room_w.lzsa\"" >> meche_graphics.inc echo "achenar_letter_lzsa: .incbin \"achenar_letter.lzsa\"" >> meche_graphics.inc - + echo "east_path_e_lzsa: .incbin \"east_path_e.lzsa\"" >> meche_graphics.inc + echo "east_path_w_lzsa: .incbin \"east_path_w.lzsa\"" >> meche_graphics.inc %.gr: %.png $(PNG2GR) $< $@ diff --git a/mist/graphics_meche/east_path_e.png b/mist/graphics_meche/east_path_e.png new file mode 100644 index 00000000..8b9d3291 Binary files /dev/null and b/mist/graphics_meche/east_path_e.png differ diff --git a/mist/graphics_meche/east_path_w.png b/mist/graphics_meche/east_path_w.png new file mode 100644 index 00000000..248f53bb Binary files /dev/null and b/mist/graphics_meche/east_path_w.png differ diff --git a/mist/graphics_meche/eastturn_n.png b/mist/graphics_meche/eastturn_n.png new file mode 100644 index 00000000..cd67257a Binary files /dev/null and b/mist/graphics_meche/eastturn_n.png differ diff --git a/mist/graphics_meche/eastturn_s.png b/mist/graphics_meche/eastturn_s.png new file mode 100644 index 00000000..f18f034d Binary files /dev/null and b/mist/graphics_meche/eastturn_s.png differ diff --git a/mist/hello.bas b/mist/hello.bas index f4b671ce..dfdd4f8d 100644 --- a/mist/hello.bas +++ b/mist/hello.bas @@ -1,5 +1,5 @@ 5 HOME -10 PRINT "LOADING MIST V0.99.2" +10 PRINT "LOADING MIST V0.99.3" 20 PRINT:PRINT 40 PRINT "CONTROLS: " 42 PRINT " MOVE CURSOR : ARROWS OR WASD" diff --git a/mist/leveldata_meche.inc b/mist/leveldata_meche.inc index 8f335203..a50b46b0 100644 --- a/mist/leveldata_meche.inc +++ b/mist/leveldata_meche.inc @@ -15,6 +15,7 @@ locations: .word location32,location33,location34,location35 .word location36,location37,location38,location39 .word location40,location41,location42,location43 + .word location44 ; MECHE_INSIDE_GEAR -- Inside gear on Mist location0: @@ -545,21 +546,21 @@ location28: .byte 18,42 ; special y .word handle_rotation_controls-1 ; special function -; MECHE EAST_PLATFORM -- rotated to east platform +; MECHE_EAST_PLATFORM -- rotated to east platform location29: .byte $ff ; north exit .byte $ff ; south exit - .byte MECHE_EAST_ARCH ; east exit + .byte MECHE_EAST_PATH ; east exit .byte MECHE_FORT_ENTRY ; west exit .byte $ff ; north exit_dir .byte $ff ; south exit_dir - .byte DIRECTION_S ; east exit_dir + .byte DIRECTION_E ; east exit_dir .byte DIRECTION_N ; west exit_dir - .word $0000 ; north bg - .word $0000 ; south bg + .word eastturn_n_lzsa ; north bg + .word eastturn_s_lzsa ; south bg .word eastturn_e_lzsa ; east bg .word eastturn_w_lzsa ; west bg - .byte BG_EAST|BG_WEST + .byte BG_EAST|BG_WEST|BG_NORTH|BG_SOUTH .byte $ff ; special exit ; MECHE EAST_ARCH -- cool archway @@ -567,7 +568,7 @@ location30: .byte $ff ; north exit .byte MECHE_EAST_TOP ; south exit .byte $ff ; east exit - .byte MECHE_EAST_PLATFORM ; west exit + .byte MECHE_EAST_PATH ; west exit .byte $ff ; north exit_dir .byte DIRECTION_E ; south exit_dir .byte $ff ; east exit_dir @@ -812,3 +813,21 @@ location43: .byte BG_SOUTH .byte $ff ; special exit +; MECHE_EAST_PATH -- path to east hint +location44: + .byte $ff ; north exit + .byte $ff ; south exit + .byte MECHE_EAST_ARCH ; east exit + .byte MECHE_EAST_PLATFORM ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_S ; east exit_dir + .byte DIRECTION_W ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word east_path_e_lzsa ; east bg + .word east_path_w_lzsa ; west bg + .byte BG_EAST|BG_WEST + .byte $ff ; special exit + +