mist: can get into the elevator

no longer fit on one disk
This commit is contained in:
Vince Weaver 2020-04-01 23:50:20 -04:00
parent be59e45578
commit 4182851cf4
10 changed files with 92 additions and 8 deletions

View File

@ -6,7 +6,7 @@ PNG_TO_40x48D = ../gr-utils/png_to_40x48d
PNG2RLE = ../gr-utils/png2rle
B2D = ../bmp2dhr/b2d
all: mist.dsk
all: mist.dsk mist_side2.dsk
mist.dsk: HELLO LOADER MIST_TITLE MIST OCTAGON MECHE SELENA VIEWER STONEY
cp empty.dsk mist.dsk
@ -15,12 +15,17 @@ mist.dsk: HELLO LOADER MIST_TITLE MIST OCTAGON MECHE SELENA VIEWER STONEY
$(DOS33) -y mist.dsk BSAVE -a 0x4000 MIST_TITLE
$(DOS33) -y mist.dsk BSAVE -a 0x1400 MIST
$(DOS33) -y mist.dsk BSAVE -a 0x1400 OCTAGON
$(DOS33) -y mist.dsk BSAVE -a 0x1400 MECHE
# $(DOS33) -y mist.dsk BSAVE -a 0x1400 MECHE
$(DOS33) -y mist.dsk BSAVE -a 0x1400 SELENA
$(DOS33) -y mist.dsk BSAVE -a 0x1400 VIEWER
$(DOS33) -y mist.dsk BSAVE -a 0x1400 STONEY
$(DOS33) -y mist.dsk BSAVE -a 0x9000 ./audio/link_noise.btc LINK_NOISE.BTC
mist_side2.dsk: MECHE
cp empty.dsk mist_side2.dsk
$(DOS33) -y mist.dsk BSAVE -a 0x1400 MECHE
$(DOS33) -y mist.dsk BSAVE -a 0x9000 ./audio/link_noise.btc LINK_NOISE.BTC
###
LOADER: loader.o

View File

@ -126,6 +126,10 @@ OCTAGON_TOWER_ROTATION = 11
OCTAGON_BOOKSHELF_CLOSE = 12
OCTAGON_TOWER_HALL1 = 13
OCTAGON_TOWER_HALL2 = 14
OCTAGON_ELEVATOR_VIEW = 15
OCTAGON_ELEVATOR_OUT = 16
OCTAGON_ELEVATOR_OPEN = 17
OCTAGON_ELEVATOR_IN = 18
; Mechanical Engineering

View File

@ -27,7 +27,10 @@ octagon_graphics.inc: \
bookshelf_close_n.lzsa \
map.lzsa tower_rotation.lzsa \
tower_hall1_n.lzsa tower_hall1_s.lzsa \
tower_hall2_n.lzsa tower_hall2_s.lzsa
tower_hall2_n.lzsa tower_hall2_s.lzsa \
elevator_far_n.lzsa \
elevator_n.lzsa elevator_s.lzsa elevator_open_n.lzsa \
elevator_lib_s.lzsa
echo "temple_door_n_lzsa: .incbin \"temple_door_n.lzsa\"" > octagon_graphics.inc
echo "temple_door_s_lzsa: .incbin \"temple_door_s.lzsa\"" >> octagon_graphics.inc
echo "temple_door_closed_s_lzsa: .incbin \"temple_door_closed_s.lzsa\"" >> octagon_graphics.inc
@ -59,8 +62,11 @@ octagon_graphics.inc: \
echo "tower_hall1_s_lzsa: .incbin \"tower_hall1_s.lzsa\"" >> octagon_graphics.inc
echo "tower_hall2_n_lzsa: .incbin \"tower_hall2_n.lzsa\"" >> octagon_graphics.inc
echo "tower_hall2_s_lzsa: .incbin \"tower_hall2_s.lzsa\"" >> octagon_graphics.inc
echo "elevator_far_n_lzsa: .incbin \"elevator_far_n.lzsa\"" >> octagon_graphics.inc
echo "elevator_n_lzsa: .incbin \"elevator_n.lzsa\"" >> octagon_graphics.inc
echo "elevator_s_lzsa: .incbin \"elevator_s.lzsa\"" >> octagon_graphics.inc
echo "elevator_open_n_lzsa: .incbin \"elevator_open_n.lzsa\"" >> octagon_graphics.inc
echo "elevator_lib_s_lzsa: .incbin \"elevator_lib_s.lzsa\"" >> octagon_graphics.inc
%.gr: %.png
$(PNG2GR) $< $@

Binary file not shown.

After

Width:  |  Height:  |  Size: 904 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 832 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 820 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 775 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 836 B

After

Width:  |  Height:  |  Size: 10 KiB

View File

@ -7,7 +7,8 @@ locations:
.word location0, location1, location2, location3
.word location4, location5, location6, location7
.word location8, location9, location10,location11
.word location12,location13,location14
.word location12,location13,location14,location15
.word location16,location17,location18
; OCTAGON_TEMPLE_DOORWAY -- temple doorway
location0:
@ -268,11 +269,11 @@ location13:
; OCTAGON_TOWER_HALL2 -- hallway to tower
location14:
.byte $ff ; north exit
.byte OCTAGON_ELEVATOR_VIEW ; north exit
.byte OCTAGON_TOWER_HALL1 ; south exit
.byte $ff ; east exit
.byte $ff ; west exit
.byte $ff ; 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
@ -283,3 +284,71 @@ location14:
.byte BG_NORTH|BG_SOUTH
.byte $ff
; OCTAGON_ELEVATOR_VIEW -- elevator in sight
location15:
.byte OCTAGON_ELEVATOR_OUT ; north exit
.byte $ff ; south exit
.byte $ff ; east exit
.byte $ff ; west exit
.byte DIRECTION_N ; north exit_dir
.byte $ff ; south exit_dir
.byte $ff ; east exit_dir
.byte $ff ; west exit_dir
.word elevator_far_n_lzsa ; north bg
.word $0000 ; south bg
.word $0000 ; east bg
.word $0000 ; west bg
.byte BG_NORTH
.byte $ff
; OCTAGON_ELEVATOR_OUT -- standing outside elevator
location16:
.byte OCTAGON_ELEVATOR_OPEN ; north exit
.byte OCTAGON_TOWER_HALL2 ; 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 elevator_n_lzsa ; north bg
.word elevator_s_lzsa ; south bg
.word $0000 ; east bg
.word $0000 ; west bg
.byte BG_NORTH|BG_SOUTH
.byte $ff
; OCTAGON_ELEVATOR_OPEN -- standing outside elevator, door open
location17:
.byte OCTAGON_ELEVATOR_IN ; north exit
.byte OCTAGON_ELEVATOR_OUT ; south exit
.byte $ff ; east exit
.byte $ff ; west exit
.byte DIRECTION_S ; north exit_dir
.byte DIRECTION_S ; south exit_dir
.byte $ff ; east exit_dir
.byte $ff ; west exit_dir
.word elevator_open_n_lzsa ; north bg
.word elevator_s_lzsa ; south bg
.word $0000 ; east bg
.word $0000 ; west bg
.byte BG_NORTH|BG_SOUTH
.byte $ff
; OCTAGON_ELEVATOR_IN -- standing in elevator
location18:
.byte $ff ; north exit
.byte OCTAGON_ELEVATOR_OUT ; south exit
.byte $ff ; east exit
.byte $ff ; west exit
.byte $ff ; north exit_dir
.byte DIRECTION_S ; south exit_dir
.byte $ff ; east exit_dir
.byte $ff ; west exit_dir
.word $0000 ; north bg
.word elevator_lib_s_lzsa ; south bg
.word $0000 ; east bg
.word $0000 ; west bg
.byte BG_SOUTH
.byte $ff