diff --git a/mist/common_defines.inc b/mist/common_defines.inc index f41084a5..7624df25 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -147,9 +147,18 @@ MECHE_CENTER_HALL2 = 24 MECHE_ELEVATOR_PATH = 25 MECHE_ELEVATOR_GROUND = 26 MECHE_ELEVATOR_HALF = 27 -MECHE_ELEVATOR_UP = 28 +MECHE_ELEVATOR_TOP = 28 +MECHE_TOP_FLOOR = 29 +MECHE_ROTATE_CONTROLS = 30 +MECHE_EAST_PLATFORM = 31 +MECHE_EAST_ARCH = 32 +MECHE_EAST_TOP = 33 +MECHE_EAST_HINT = 34 +MECHE_EXIT_PUZZLE = 35 +MECHE_MIST_BOOK = 36 +MECHE_MIST_CLOSED = 37 +MECHE_MIST_OPEN = 38 -;MECHE_EAST_PLATFORM = 9 ; Selena Age diff --git a/mist/graphics_meche/Makefile b/mist/graphics_meche/Makefile index 4e02c98c..53f67be8 100644 --- a/mist/graphics_meche/Makefile +++ b/mist/graphics_meche/Makefile @@ -37,7 +37,16 @@ meche_graphics.inc: \ blue_room_center_n.lzsa blue_room_center_s.lzsa \ center_hall2_n.lzsa center_hall2_s.lzsa center_hall2_w.lzsa \ elevator_path_e.lzsa elevator_path_w.lzsa \ - elevator_ground_e.lzsa + elevator_ground_e.lzsa \ + elevator_top_e.lzsa \ + elevator_half_e.lzsa \ + top_floor_e.lzsa \ + top_floor_ye_w.lzsa top_floor_ne_w.lzsa \ + rotate_controls_e.lzsa \ + eastturn_e.lzsa eastturn_w.lzsa \ + east_arch_w.lzsa east_arch_s.lzsa \ + east_hint_e.lzsa \ + east_top_e.lzsa east_top_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 @@ -99,6 +108,23 @@ meche_graphics.inc: \ echo "elevator_path_w_lzsa: .incbin \"elevator_path_w.lzsa\"" >> meche_graphics.inc echo "elevator_path_e_lzsa: .incbin \"elevator_path_e.lzsa\"" >> meche_graphics.inc echo "elevator_ground_e_lzsa: .incbin \"elevator_ground_e.lzsa\"" >> meche_graphics.inc + echo "elevator_half_e_lzsa: .incbin \"elevator_half_e.lzsa\"" >> meche_graphics.inc + echo "elevator_top_e_lzsa: .incbin \"elevator_top_e.lzsa\"" >> meche_graphics.inc + echo "top_floor_e_lzsa: .incbin \"top_floor_e.lzsa\"" >> meche_graphics.inc + echo "top_floor_ye_w_lzsa: .incbin \"top_floor_ye_w.lzsa\"" >> meche_graphics.inc + echo "top_floor_ne_w_lzsa: .incbin \"top_floor_ne_w.lzsa\"" >> 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 "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 + echo "east_top_e_lzsa: .incbin \"east_top_e.lzsa\"" >> meche_graphics.inc + echo "east_top_w_lzsa: .incbin \"east_top_w.lzsa\"" >> meche_graphics.inc + + + + %.gr: %.png $(PNG2GR) $< $@ diff --git a/mist/graphics_meche/east_arch_s.png b/mist/graphics_meche/east_arch_s.png new file mode 100644 index 00000000..90a62d95 Binary files /dev/null and b/mist/graphics_meche/east_arch_s.png differ diff --git a/mist/graphics_meche/east_arch_w.png b/mist/graphics_meche/east_arch_w.png new file mode 100644 index 00000000..a943e4e2 Binary files /dev/null and b/mist/graphics_meche/east_arch_w.png differ diff --git a/mist/graphics_meche/east_hint_e.png b/mist/graphics_meche/east_hint_e.png new file mode 100644 index 00000000..62fffde9 Binary files /dev/null and b/mist/graphics_meche/east_hint_e.png differ diff --git a/mist/graphics_meche/east_top_e.png b/mist/graphics_meche/east_top_e.png new file mode 100644 index 00000000..8a623dfe Binary files /dev/null and b/mist/graphics_meche/east_top_e.png differ diff --git a/mist/graphics_meche/east_top_w.png b/mist/graphics_meche/east_top_w.png new file mode 100644 index 00000000..2f0b65de Binary files /dev/null and b/mist/graphics_meche/east_top_w.png differ diff --git a/mist/graphics_meche/eastturn_e.png b/mist/graphics_meche/eastturn_e.png new file mode 100644 index 00000000..463e44d0 Binary files /dev/null and b/mist/graphics_meche/eastturn_e.png differ diff --git a/mist/graphics_meche/eastturn_w.png b/mist/graphics_meche/eastturn_w.png new file mode 100644 index 00000000..80281386 Binary files /dev/null and b/mist/graphics_meche/eastturn_w.png differ diff --git a/mist/graphics_meche/elevator_half_e.png b/mist/graphics_meche/elevator_half_e.png new file mode 100644 index 00000000..ec777254 Binary files /dev/null and b/mist/graphics_meche/elevator_half_e.png differ diff --git a/mist/graphics_meche/elevator_top_e.png b/mist/graphics_meche/elevator_top_e.png new file mode 100644 index 00000000..321121e1 Binary files /dev/null and b/mist/graphics_meche/elevator_top_e.png differ diff --git a/mist/graphics_meche/meche_graphics.inc b/mist/graphics_meche/meche_graphics.inc index 58e624e1..30ad066d 100644 --- a/mist/graphics_meche/meche_graphics.inc +++ b/mist/graphics_meche/meche_graphics.inc @@ -59,3 +59,16 @@ center_hall2_w_lzsa: .incbin "center_hall2_w.lzsa" elevator_path_w_lzsa: .incbin "elevator_path_w.lzsa" elevator_path_e_lzsa: .incbin "elevator_path_e.lzsa" elevator_ground_e_lzsa: .incbin "elevator_ground_e.lzsa" +elevator_half_e_lzsa: .incbin "elevator_half_e.lzsa" +elevator_top_e_lzsa: .incbin "elevator_top_e.lzsa" +top_floor_e_lzsa: .incbin "top_floor_e.lzsa" +top_floor_ye_w_lzsa: .incbin "top_floor_ye_w.lzsa" +top_floor_ne_w_lzsa: .incbin "top_floor_ne_w.lzsa" +rotate_controls_e_lzsa: .incbin "rotate_controls_e.lzsa" +eastturn_e_lzsa: .incbin "eastturn_e.lzsa" +eastturn_w_lzsa: .incbin "eastturn_w.lzsa" +east_arch_w_lzsa: .incbin "east_arch_w.lzsa" +east_arch_s_lzsa: .incbin "east_arch_s.lzsa" +east_hint_e_lzsa: .incbin "east_hint_e.lzsa" +east_top_e_lzsa: .incbin "east_top_e.lzsa" +east_top_w_lzsa: .incbin "east_top_w.lzsa" diff --git a/mist/graphics_meche/rotate_controls_e.png b/mist/graphics_meche/rotate_controls_e.png new file mode 100644 index 00000000..ae8f459f Binary files /dev/null and b/mist/graphics_meche/rotate_controls_e.png differ diff --git a/mist/graphics_meche/top_floor_e.png b/mist/graphics_meche/top_floor_e.png new file mode 100644 index 00000000..91f7e87a Binary files /dev/null and b/mist/graphics_meche/top_floor_e.png differ diff --git a/mist/graphics_meche/top_floor_ne_w.png b/mist/graphics_meche/top_floor_ne_w.png new file mode 100644 index 00000000..dbccb72d Binary files /dev/null and b/mist/graphics_meche/top_floor_ne_w.png differ diff --git a/mist/graphics_meche/top_floor_ye_w.png b/mist/graphics_meche/top_floor_ye_w.png new file mode 100644 index 00000000..87529628 Binary files /dev/null and b/mist/graphics_meche/top_floor_ye_w.png differ diff --git a/mist/leveldata_meche.inc b/mist/leveldata_meche.inc index b0165148..f2364ee3 100644 --- a/mist/leveldata_meche.inc +++ b/mist/leveldata_meche.inc @@ -11,7 +11,8 @@ locations: .word location16,location17,location18,location19 .word location20,location21,location22,location23 .word location24,location25,location26,location27 - .word location28 + .word location28,location29,location30,location31 + .word location32,location33,location34 ; MECHE_INSIDE_GEAR -- Inside gear on Mist location0: @@ -277,11 +278,11 @@ location14: ; MECHE_LEFT_HALL_CORNER -- left hallway corner location15: - .byte $ff ; north exit + .byte MECHE_LEFT_HALL_CORNER ; north exit .byte MECHE_LEFT_HALL2 ; south exit .byte MECHE_RED_ROOM_CENTER ; east exit .byte $ff ; west exit - .byte $ff ; north exit_dir + .byte DIRECTION_E ; north exit_dir .byte DIRECTION_S ; south exit_dir .byte DIRECTION_E ; east exit_dir .byte $ff ; west exit_dir @@ -404,11 +405,11 @@ location21: ; MECHE_RIGHT_HALL_CORNER -- looks a lot like left hall corner location22: .byte MECHE_BLUE_ROOM_CENTER ; north exit - .byte $ff ; south exit + .byte MECHE_RIGHT_HALL_CORNER ; south exit .byte $ff ; east exit .byte MECHE_RIGHT_HALL2 ; west exit .byte DIRECTION_N ; north exit_dir - .byte $ff ; south exit_dir + .byte DIRECTION_W ; south exit_dir .byte $ff ; east exit_dir .byte DIRECTION_W ; west exit_dir .word right_hall_corner_n_lzsa ; north bg @@ -501,7 +502,7 @@ location27: .byte $0000 ; west exit_dir .word $0000 ; north bg .word $0000 ; south bg - .word elevator_ground_e_lzsa ; east bg + .word elevator_half_e_lzsa ; east bg .word $0000 ; west bg .byte BG_EAST .byte $ff ; special exit @@ -510,16 +511,120 @@ location27: location28: .byte $ff ; north exit .byte $ff ; south exit - .byte $ff ; east exit + .byte MECHE_TOP_FLOOR ; east exit .byte $ff ; west exit .byte $ff ; north exit_dir .byte $ff ; south exit_dir - .byte $ff ; east exit_dir + .byte DIRECTION_E ; east exit_dir .byte $0000 ; west exit_dir .word $0000 ; north bg .word $0000 ; south bg - .word elevator_ground_e_lzsa ; east bg + .word elevator_top_e_lzsa ; east bg .word $0000 ; west bg .byte BG_EAST .byte $ff ; special exit +; MECHE_TOP_FLOOR -- elevator top floor +location29: + .byte $ff ; north exit + .byte $ff ; south exit + .byte MECHE_TOP_FLOOR ; east exit + .byte MECHE_ELEVATOR_TOP ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_W ; east exit_dir + .byte DIRECTION_E ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word top_floor_e_lzsa ; east bg + .word top_floor_ye_w_lzsa ; west bg + .byte BG_EAST|BG_WEST + .byte $ff ; special exit + +; MECHE_ROTATE_CONTROLS -- elevator rotate controls +location30: + .byte $ff ; north exit + .byte $ff ; south exit + .byte MECHE_TOP_FLOOR ; east exit + .byte MECHE_ELEVATOR_TOP ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_W ; east exit_dir + .byte DIRECTION_E ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word rotate_controls_e_lzsa ; east bg + .word $0000 ; west bg + .byte BG_EAST|BG_WEST + .byte $ff ; special exit + + +; MECHE EAST_PLATFORM -- rotated to east platform +location31: + .byte $ff ; north exit + .byte $ff ; south exit + .byte MECHE_EAST_ARCH ; 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_N ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word eastturn_e_lzsa ; east bg + .word eastturn_w_lzsa ; west bg + .byte BG_EAST|BG_WEST + .byte $ff ; special exit + +; MECHE EAST_ARCH -- cool archway +location32: + .byte $ff ; north exit + .byte MECHE_EAST_TOP ; south exit + .byte $ff ; east exit + .byte MECHE_EAST_PLATFORM ; west exit + .byte $ff ; north exit_dir + .byte DIRECTION_E ; south exit_dir + .byte $ff ; east exit_dir + .byte DIRECTION_W ; west exit_dir + .word $0000 ; north bg + .word east_arch_s_lzsa ; south bg + .word $0000 ; east bg + .word east_arch_w_lzsa ; west bg + .byte BG_SOUTH|BG_WEST + .byte $ff ; special exit + +; MECHE EAST_TOP -- top of the world +location33: + .byte $ff ; north exit + .byte $ff ; south exit + .byte MECHE_EAST_HINT ; east exit + .byte MECHE_EAST_ARCH ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_E ; east exit_dir + .byte DIRECTION_W ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word east_top_e_lzsa ; east bg + .word east_top_w_lzsa ; west bg + .byte BG_EAST|BG_WEST + .byte $ff ; special exit + +; MECHE EAST_HINT -- final hint +location34: + .byte $ff ; north exit + .byte $ff ; south exit + .byte MECHE_EAST_TOP ; east exit + .byte $ff ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_W ; east exit_dir + .byte $ff ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word east_hint_e_lzsa ; east bg + .word $0000 ; west bg + .byte BG_EAST + .byte $ff ; special exit + +