1
0
mirror of https://github.com/deater/dos33fsprogs.git synced 2025-01-20 06:31:11 +00:00

mist: meche: can walk full circle of rooms

This commit is contained in:
Vince Weaver 2020-03-21 12:31:00 -04:00
parent 3543b9323c
commit 3ce5ada070
12 changed files with 100 additions and 6 deletions

@ -140,7 +140,10 @@ MECHE_CENTER_HALL = 17
MECHE_RED_BUTTON = 18 MECHE_RED_BUTTON = 18
MECHE_BASEMENT = 19 MECHE_BASEMENT = 19
MECHE_ELEVATOR_ROTATE = 20 MECHE_ELEVATOR_ROTATE = 20
MECHE_RIGHT_HALL2 = 21
MECHE_RIGHT_HALL_CORNER = 22
MECHE_BLUE_ROOM_CENTER = 23
MECHE_CENTER_HALL2 = 24
;MECHE_EAST_PLATFORM = 9 ;MECHE_EAST_PLATFORM = 9

@ -31,7 +31,11 @@ meche_graphics.inc: \
red_button_of_oe_w.lzsa red_button_of_ce_w.lzsa \ red_button_of_oe_w.lzsa red_button_of_ce_w.lzsa \
red_button_cf_oe_w.lzsa red_button_cf_ce_w.lzsa \ red_button_cf_oe_w.lzsa red_button_cf_ce_w.lzsa \
basement_controls_w.lzsa \ basement_controls_w.lzsa \
elevator_basement_w.lzsa elevator_basement_w.lzsa \
right_hall2_s.lzsa \
right_hall_corner_n.lzsa right_hall_corner_w.lzsa \
blue_room_center_n.lzsa blue_room_center_s.lzsa \
center_hall2_n.lzsa center_hall2_s.lzsa center_hall2_w.lzsa
echo "departure_e_lzsa: .incbin \"departure_e.lzsa\"" > meche_graphics.inc echo "departure_e_lzsa: .incbin \"departure_e.lzsa\"" > meche_graphics.inc
echo "arrival_w_lzsa: .incbin \"arrival_w.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 echo "entrance_e_lzsa: .incbin \"entrance_e.lzsa\"" >> meche_graphics.inc
@ -81,6 +85,15 @@ meche_graphics.inc: \
echo "red_button_cf_ce_w_lzsa: .incbin \"red_button_cf_ce_w.lzsa\"" >> meche_graphics.inc echo "red_button_cf_ce_w_lzsa: .incbin \"red_button_cf_ce_w.lzsa\"" >> meche_graphics.inc
echo "basement_controls_w_lzsa: .incbin \"basement_controls_w.lzsa\"" >> meche_graphics.inc echo "basement_controls_w_lzsa: .incbin \"basement_controls_w.lzsa\"" >> meche_graphics.inc
echo "elevator_basement_w_lzsa: .incbin \"elevator_basement_w.lzsa\"" >> meche_graphics.inc echo "elevator_basement_w_lzsa: .incbin \"elevator_basement_w.lzsa\"" >> meche_graphics.inc
echo "right_hall2_s_lzsa: .incbin \"right_hall2_s.lzsa\"" >> meche_graphics.inc
echo "right_hall_corner_n_lzsa: .incbin \"right_hall_corner_n.lzsa\"" >> meche_graphics.inc
echo "right_hall_corner_w_lzsa: .incbin \"right_hall_corner_w.lzsa\"" >> meche_graphics.inc
echo "blue_room_center_n_lzsa: .incbin \"blue_room_center_n.lzsa\"" >> meche_graphics.inc
echo "blue_room_center_s_lzsa: .incbin \"blue_room_center_s.lzsa\"" >> meche_graphics.inc
echo "center_hall2_n_lzsa: .incbin \"center_hall2_n.lzsa\"" >> meche_graphics.inc
echo "center_hall2_s_lzsa: .incbin \"center_hall2_s.lzsa\"" >> meche_graphics.inc
echo "center_hall2_w_lzsa: .incbin \"center_hall2_w.lzsa\"" >> meche_graphics.inc
%.gr: %.png %.gr: %.png
$(PNG2GR) $< $@ $(PNG2GR) $< $@

Binary file not shown.

After

(image error) Size: 1.1 KiB

Binary file not shown.

After

(image error) Size: 1.1 KiB

Binary file not shown.

After

(image error) Size: 6.9 KiB

Binary file not shown.

After

(image error) Size: 922 B

Binary file not shown.

After

(image error) Size: 8.4 KiB

@ -47,3 +47,11 @@ red_button_of_ce_w_lzsa: .incbin "red_button_of_ce_w.lzsa"
red_button_cf_ce_w_lzsa: .incbin "red_button_cf_ce_w.lzsa" red_button_cf_ce_w_lzsa: .incbin "red_button_cf_ce_w.lzsa"
basement_controls_w_lzsa: .incbin "basement_controls_w.lzsa" basement_controls_w_lzsa: .incbin "basement_controls_w.lzsa"
elevator_basement_w_lzsa: .incbin "elevator_basement_w.lzsa" elevator_basement_w_lzsa: .incbin "elevator_basement_w.lzsa"
right_hall2_s_lzsa: .incbin "right_hall2_s.lzsa"
right_hall_corner_n_lzsa: .incbin "right_hall_corner_n.lzsa"
right_hall_corner_w_lzsa: .incbin "right_hall_corner_w.lzsa"
blue_room_center_n_lzsa: .incbin "blue_room_center_n.lzsa"
blue_room_center_s_lzsa: .incbin "blue_room_center_s.lzsa"
center_hall2_n_lzsa: .incbin "center_hall2_n.lzsa"
center_hall2_s_lzsa: .incbin "center_hall2_s.lzsa"
center_hall2_w_lzsa: .incbin "center_hall2_w.lzsa"

Binary file not shown.

After

(image error) Size: 9.8 KiB

Binary file not shown.

After

(image error) Size: 821 B

Binary file not shown.

After

(image error) Size: 8.2 KiB

@ -9,7 +9,8 @@ locations:
.word location8, location9, location10,location11 .word location8, location9, location10,location11
.word location12,location13,location14,location15 .word location12,location13,location14,location15
.word location16,location17,location18,location19 .word location16,location17,location18,location19
.word location20 .word location20,location21,location22,location23
.word location24
; MECHE_INSIDE_GEAR -- Inside gear on Mist ; MECHE_INSIDE_GEAR -- Inside gear on Mist
location0: location0:
@ -157,11 +158,11 @@ location7:
location8: location8:
.byte MECHE_LEFT_HALL2 ; north exit .byte MECHE_LEFT_HALL2 ; north exit
.byte MECHE_BRIDGE2 ; south exit .byte MECHE_BRIDGE2 ; south exit
.byte $ff ; east exit .byte MECHE_RIGHT_HALL2 ; east exit
.byte $ff ; west exit .byte $ff ; west exit
.byte DIRECTION_N ; north exit_dir .byte DIRECTION_N ; north exit_dir
.byte DIRECTION_S ; south exit_dir .byte DIRECTION_S ; south exit_dir
.byte $ff ; east exit_dir .byte DIRECTION_E ; east exit_dir
.byte $ff ; west exit_dir .byte $ff ; west exit_dir
.word fort_entry_n_lzsa ; north bg .word fort_entry_n_lzsa ; north bg
.word fort_entry_s_lzsa ; south bg .word fort_entry_s_lzsa ; south bg
@ -327,7 +328,7 @@ location17:
; MECHE_RED_BUTTON -- Button on wall ; MECHE_RED_BUTTON -- Button on wall
location18: location18:
.byte MECHE_CENTER_HALL ; north exit .byte MECHE_CENTER_HALL ; north exit
.byte $ff ; south exit .byte MECHE_CENTER_HALL2 ; south exit
.byte $ff ; east exit .byte $ff ; east exit
.byte $ff ; west exit .byte $ff ; west exit
.byte DIRECTION_W ; north exit_dir .byte DIRECTION_W ; north exit_dir
@ -375,5 +376,74 @@ location20:
.byte BG_WEST .byte BG_WEST
.byte $ff ; special exit .byte $ff ; special exit
; MECHE_RIGHT_HALL2 -- looks a lot like left hall2
location21:
.byte $ff ; north exit
.byte $ff ; south exit
.byte MECHE_RIGHT_HALL_CORNER ; east exit
.byte MECHE_FORT_ENTRY ; west exit
.byte $ff ; north exit_dir
.byte $ff ; south exit_dir
.byte DIRECTION_N ; east exit_dir
.byte DIRECTION_S ; west exit_dir
.word $0000 ; north bg
.word $0000 ; south bg
.word left_hall2_n_lzsa ; east bg
.word right_hall2_s_lzsa ; west bg
.byte BG_EAST|BG_WEST
.byte $ff ; special exit
; MECHE_RIGHT_HALL_CORNER -- looks a lot like left hall corner
location22:
.byte MECHE_BLUE_ROOM_CENTER ; north exit
.byte $ff ; south exit
.byte $ff ; east exit
.byte MECHE_RIGHT_HALL2 ; west exit
.byte DIRECTION_N ; north exit_dir
.byte $ff ; south exit_dir
.byte $ff ; east exit_dir
.byte DIRECTION_W ; west exit_dir
.word right_hall_corner_n_lzsa ; north bg
.word $0000 ; south bg
.word $0000 ; east bg
.word right_hall_corner_w_lzsa ; west bg
.byte BG_NORTH|BG_WEST
.byte $ff ; special exit
; MECHE_BLUE_ROOM_CENTER -- center of blue room
location23:
.byte MECHE_CENTER_HALL2 ; north exit
.byte MECHE_RIGHT_HALL2 ; south exit
.byte $ff ; east exit
.byte MECHE_RIGHT_HALL_CORNER ; west exit
.byte DIRECTION_N ; north exit_dir
.byte DIRECTION_W ; south exit_dir
.byte $ff ; east exit_dir
.byte $ff ; west exit_dir
.word blue_room_center_n_lzsa ; north bg
.word blue_room_center_s_lzsa ; south bg
.word $0000 ; east bg
.word $0000 ; west bg
.byte BG_NORTH|BG_SOUTH
.byte $ff ; special exit
; MECHE_CENTER_HALL2 -- center hall 2
location24:
.byte $ff ; north exit
.byte MECHE_BLUE_ROOM_CENTER ; south exit
.byte $ff ; east exit
.byte MECHE_RED_BUTTON ; west exit
.byte DIRECTION_N ; north exit_dir
.byte DIRECTION_S ; south exit_dir
.byte $ff ; east exit_dir
.byte DIRECTION_N ; west exit_dir
.word center_hall2_n_lzsa ; north bg
.word center_hall2_s_lzsa ; south bg
.word $ff ; east bg
.word center_hall2_w_lzsa ; west bg
.byte BG_WEST|BG_NORTH|BG_SOUTH
.byte $ff ; special exit